components/lighttpd/patches/lighttpd-conf_file.patch
author Jiri Kukacka <jiri.kukacka@oracle.com>
Tue, 14 Jan 2014 08:01:05 -0800
branchs11u1-sru
changeset 2934 ed4c692fa932
parent 331 5001b63ddc8a
child 3190 44a15b136f48
permissions -rw-r--r--
17600553 Upgrade lighttpd to version 1.4.33 17488086 problem in UTILITY/LIGHTTPD 17536689 problem in UTILITY/LIGHTTPD

--- doc/config/lighttpd.conf	2014-01-22 05:36:22.027115196 -0800
+++ doc/config/lighttpd.conf	2014-01-22 05:34:05.471641339 -0800
@@ -13,11 +13,11 @@
 ## if you add a variable here. Add the corresponding variable in the
 ## chroot example aswell.
 ##
-var.log_root    = "/var/log/lighttpd"
-var.server_root = "/srv/www"
-var.state_dir   = "/var/run"
-var.home_dir    = "/var/lib/lighttpd"
-var.conf_dir    = "/etc/lighttpd"
+var.log_root    = "/var/lighttpd/1.4/logs"
+var.server_root = "/var/lighttpd/1.4"
+var.state_dir   = log_root
+var.home_dir    = server_root
+var.conf_dir    = "/etc/lighttpd/1.4"
 
 ## 
 ## run the server chrooted.
@@ -58,7 +58,7 @@
 ## used in:
 ## conf.d/compress.conf
 ##
-var.cache_dir   = "/var/cache/lighttpd"
+var.cache_dir   = server_root + "/cache"
 
 ##
 ## Base directory for sockets.
@@ -101,8 +101,8 @@
 ## Run as a different username/groupname.
 ## This requires root permissions during startup. 
 ##
-server.username  = "lighttpd"
-server.groupname = "lighttpd"
+server.username  = "webservd"
+server.groupname = "webservd"
 
 ## 
 ## enable core files.
@@ -112,7 +112,7 @@
 ##
 ## Document root
 ##
-server.document-root = server_root + "/htdocs"
+server.document-root = server_root + "/docroot"
 
 ##
 ## The value for the "Server:" response field.
@@ -124,7 +124,8 @@
 ##
 ## store a pid file
 ##
-server.pid-file = state_dir + "/lighttpd.pid"
+# There must be full path in order to SMF methods work properly
+server.pid-file = "/var/lighttpd/1.4/logs/lighttpd14.pid"
 
 ##
 #######################################################################
@@ -178,7 +178,7 @@
 ##
 ## linux-sysepoll is recommended on kernel 2.6.
 ##
-server.event-handler = "linux-sysepoll"
+server.event-handler = "solaris-devpoll"
 
 ##
 ## The basic network interface for all platforms at the syscalls read()
@@ -188,7 +188,7 @@
 ## linux-sendfile - is recommended for small files.
 ## writev         - is recommended for sending many large files
 ##
-server.network-backend = "linux-sendfile"
+server.network-backend = "solaris-sendfilev"
 
 ##
 ## As lighttpd is a single-threaded server, its main resource limit is
@@ -296,7 +296,7 @@
 ##                                 "index.htm", "default.htm" )
 ##
 index-file.names += (
-  "index.xhtml", "index.html", "index.htm", "default.htm", "index.php"
+  "index.php", "index.html", "index.htm", "default.htm", "index.xhtml"
 )
 
 ##
@@ -345,7 +345,7 @@
 ## Format: <errorfile-prefix><status-code>.html
 ## -> ..../status-404.html for 'File not found'
 ##
-#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
+#server.errorfile-prefix    = "/var/lighttpd/1.4/errors/status-"
 
 ##
 ## mimetype mapping
116,128d121
--- doc/config/conf.d/fastcgi.conf    2013-10-07 07:21:24.418114603 -0700
+++ doc/config/conf.d/fastcgi.conf    2013-10-07 07:24:01.824986033 -0700
@@ -22,8 +22,8 @@
 #fastcgi.server = ( ".php" =>
 #                   ( "php-local" =>
 #                     (
-#                       "socket" => socket_dir + "/php-fastcgi-1.socket",
-#                       "bin-path" => server_root + "/cgi-bin/php5",
+#                       "socket" => socket_dir + "/php-fastcgi.socket",
+#                       "bin-path" => "/usr/php/bin/php-cgi",
 #                       "max-procs" => 1,
 #                       "broken-scriptfilename" => "enable",
 #                     )