components/lighttpd/patches/03-lighttpd.conf.patch
branchs11-update
changeset 2925 d64f6e80d9b1
parent 331 5001b63ddc8a
child 3053 60a045d209ef
equal deleted inserted replaced
2924:894dcec4ac14 2925:d64f6e80d9b1
       
     1 Developed in-house, not fed back.
       
     2 Solaris-specific: configuration file customization.
       
     3 
       
     4 --- doc/config/lighttpd.conf	2013-11-04 10:28:44.024176425 -0800
       
     5 +++ doc/config/lighttpd.conf	2013-11-04 10:28:16.072079454 -0800
       
     6 @@ -13,11 +13,11 @@
       
     7  ## if you add a variable here. Add the corresponding variable in the
       
     8  ## chroot example aswell.
       
     9  ##
       
    10 -var.log_root    = "/var/log/lighttpd"
       
    11 -var.server_root = "/srv/www"
       
    12 -var.state_dir   = "/var/run"
       
    13 -var.home_dir    = "/var/lib/lighttpd"
       
    14 -var.conf_dir    = "/etc/lighttpd"
       
    15 +var.log_root    = "/var/lighttpd/1.4/logs"
       
    16 +var.server_root = "/var/lighttpd/1.4"
       
    17 +var.state_dir   = log_root
       
    18 +var.home_dir    = server_root
       
    19 +var.conf_dir    = "/etc/lighttpd/1.4"
       
    20  
       
    21  ## 
       
    22  ## run the server chrooted.
       
    23 @@ -58,7 +58,7 @@
       
    24  ## used in:
       
    25  ## conf.d/compress.conf
       
    26  ##
       
    27 -var.cache_dir   = "/var/cache/lighttpd"
       
    28 +var.cache_dir   = server_root + "/cache"
       
    29  
       
    30  ##
       
    31  ## Base directory for sockets.
       
    32 @@ -101,8 +101,8 @@
       
    33  ## Run as a different username/groupname.
       
    34  ## This requires root permissions during startup. 
       
    35  ##
       
    36 -server.username  = "lighttpd"
       
    37 -server.groupname = "lighttpd"
       
    38 +server.username  = "webservd"
       
    39 +server.groupname = "webservd"
       
    40  
       
    41  ## 
       
    42  ## enable core files.
       
    43 @@ -112,7 +112,7 @@
       
    44  ##
       
    45  ## Document root
       
    46  ##
       
    47 -server.document-root = server_root + "/htdocs"
       
    48 +server.document-root = server_root + "/docroot"
       
    49  
       
    50  ##
       
    51  ## The value for the "Server:" response field.
       
    52 @@ -124,7 +124,7 @@
       
    53  ##
       
    54  ## store a pid file
       
    55  ##
       
    56 -server.pid-file = state_dir + "/lighttpd.pid"
       
    57 +server.pid-file = log_root + "/run.pid"
       
    58  
       
    59  ##
       
    60  #######################################################################
       
    61 @@ -178,7 +178,7 @@
       
    62  ##
       
    63  ## linux-sysepoll is recommended on kernel 2.6.
       
    64  ##
       
    65 -server.event-handler = "linux-sysepoll"
       
    66 +server.event-handler = "solaris-devpoll"
       
    67  
       
    68  ##
       
    69  ## The basic network interface for all platforms at the syscalls read()
       
    70 @@ -188,7 +188,7 @@
       
    71  ## linux-sendfile - is recommended for small files.
       
    72  ## writev         - is recommended for sending many large files
       
    73  ##
       
    74 -server.network-backend = "linux-sendfile"
       
    75 +server.network-backend = "solaris-sendfilev"
       
    76  
       
    77  ##
       
    78  ## As lighttpd is a single-threaded server, its main resource limit is
       
    79 @@ -296,7 +296,7 @@
       
    80  ##                                 "index.htm", "default.htm" )
       
    81  ##
       
    82  index-file.names += (
       
    83 -  "index.xhtml", "index.html", "index.htm", "default.htm", "index.php"
       
    84 +  "index.php", "index.html", "index.htm", "default.htm", "index.xhtml"
       
    85  )
       
    86  
       
    87  ##
       
    88 @@ -345,7 +345,7 @@
       
    89  ## Format: <errorfile-prefix><status-code>.html
       
    90  ## -> ..../status-404.html for 'File not found'
       
    91  ##
       
    92 -#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
       
    93 +#server.errorfile-prefix    = "/var/lighttpd/1.4/errors/status-"
       
    94  
       
    95  ##
       
    96  ## mimetype mapping
       
    97 --- doc/config/conf.d/fastcgi.conf	2013-10-07 07:21:24.418114603 -0700
       
    98 +++ doc/config/conf.d/fastcgi.conf	2013-10-07 07:24:01.824986033 -0700
       
    99 @@ -22,8 +22,8 @@
       
   100  #fastcgi.server = ( ".php" =>
       
   101  #                   ( "php-local" =>
       
   102  #                     (
       
   103 -#                       "socket" => socket_dir + "/php-fastcgi-1.socket",
       
   104 -#                       "bin-path" => server_root + "/cgi-bin/php5",
       
   105 +#                       "socket" => socket_dir + "/php-fastcgi.socket",
       
   106 +#                       "bin-path" => "/usr/php/bin/php-cgi",
       
   107  #                       "max-procs" => 1,
       
   108  #                       "broken-scriptfilename" => "enable",
       
   109  #                     )