components/web/lighttpd/patches/03-lighttpd.conf.patch

   1 Developed in-house, not fed back.
   2 Solaris-specific: configuration file customization.
   3
   4 --- doc/config/lighttpd.conf    2013-11-04 08:53:35.317845225 -0800
   5 +++ doc/config/lighttpd.conf    2013-11-04 08:52:54.468735970 -0800
   6 @@ -13,11 +13,11 @@
   7  ## if you add a variable here. Add the corresponding variable in the
   8  ## chroot example as well.
   9  ##
  10 -var.log_root    = "/var/log/lighttpd"
  11 -var.server_root = "/srv/www"
  12 -var.state_dir   = "/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 lighttpd to serve requests on sockets received from systemd
  43 @@ -118,7 +118,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 @@ -130,7 +130,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 @@ -184,7 +184,7 @@
  62  ## select (*not* recommended)
  63  ## libev  (*not* recommended)
  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 @@ -331,7 +331,7 @@
  71  ##                                 "index.htm", "default.htm" )
  72  ##
  73  index-file.names += (
  74 -  "index.xhtml", "index.html", "index.htm", "default.htm", "index.php"
  75 +  "index.php", "index.html", "index.htm", "default.htm", "index.xhtml"
  76  )
  77
  78  ##
  79 @@ -386,7 +386,7 @@
  80  ## Format: <errorfile-prefix><status-code>.html
  81  ## -> ..../status-404.html for 'File not found'
  82  ##
  83 -#server.errorfile-prefix    = server_root + "/htdocs/errors/status-"
  84 +#server.errorfile-prefix    = "/var/lighttpd/1.4/errors/status-"
  85
  86  ##
  87  ## mimetype mapping
  88 --- doc/config/conf.d/fastcgi.conf      2013-10-07 07:21:24.418114603 -0700
  89 +++ doc/config/conf.d/fastcgi.conf      2013-10-07 07:24:01.824986033 -0700
  90 @@ -22,8 +22,8 @@
  91  #fastcgi.server = ( ".php" =>
  92  #                   ( "php-local" =>
  93  #                     (
  94 -#                       "socket" => socket_dir + "/php-fastcgi-1.socket",
  95 -#                       "bin-path" => server_root + "/cgi-bin/php5",
  96 +#                       "socket" => socket_dir + "/php-fastcgi.socket",
  97 +#                       "bin-path" => "/usr/php/bin/php-cgi",
  98  #                       "max-procs" => 1,
  99  #                       "broken-scriptfilename" => "enable",
 100  #                     )