components/lighttpd/patches/lighttpd-conf_file.patch
branchs11u1-sru
changeset 3190 44a15b136f48
parent 2934 ed4c692fa932
equal deleted inserted replaced
3189:29f154187658 3190:44a15b136f48
     1 --- doc/config/lighttpd.conf	2014-01-22 05:36:22.027115196 -0800
     1 Developed in-house, not fed back.
     2 +++ doc/config/lighttpd.conf	2014-01-22 05:34:05.471641339 -0800
     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
     3 @@ -13,11 +13,11 @@
     6 @@ -13,11 +13,11 @@
     4  ## if you add a variable here. Add the corresponding variable in the
     7  ## if you add a variable here. Add the corresponding variable in the
     5  ## chroot example aswell.
     8  ## chroot example aswell.
     6  ##
     9  ##
     7 -var.log_root    = "/var/log/lighttpd"
    10 -var.log_root    = "/var/log/lighttpd"
    44 -server.document-root = server_root + "/htdocs"
    47 -server.document-root = server_root + "/htdocs"
    45 +server.document-root = server_root + "/docroot"
    48 +server.document-root = server_root + "/docroot"
    46  
    49  
    47  ##
    50  ##
    48  ## The value for the "Server:" response field.
    51  ## The value for the "Server:" response field.
    49 @@ -124,7 +124,8 @@
    52 @@ -124,7 +124,7 @@
    50  ##
    53  ##
    51  ## store a pid file
    54  ## store a pid file
    52  ##
    55  ##
    53 -server.pid-file = state_dir + "/lighttpd.pid"
    56 -server.pid-file = state_dir + "/lighttpd.pid"
    54 +# There must be full path in order to SMF methods work properly
    57 +server.pid-file = log_root + "/run.pid"
    55 +server.pid-file = "/var/lighttpd/1.4/logs/lighttpd14.pid"
       
    56  
    58  
    57  ##
    59  ##
    58  #######################################################################
    60  #######################################################################
    59 @@ -178,7 +178,7 @@
    61 @@ -178,7 +178,7 @@
    60  ##
    62  ##
    90 -#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
    92 -#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
    91 +#server.errorfile-prefix    = "/var/lighttpd/1.4/errors/status-"
    93 +#server.errorfile-prefix    = "/var/lighttpd/1.4/errors/status-"
    92  
    94  
    93  ##
    95  ##
    94  ## mimetype mapping
    96  ## mimetype mapping
    95 116,128d121
    97 --- doc/config/conf.d/fastcgi.conf	2013-10-07 07:21:24.418114603 -0700
    96 --- 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
    97 +++ doc/config/conf.d/fastcgi.conf    2013-10-07 07:24:01.824986033 -0700
       
    98 @@ -22,8 +22,8 @@
    99 @@ -22,8 +22,8 @@
    99  #fastcgi.server = ( ".php" =>
   100  #fastcgi.server = ( ".php" =>
   100  #                   ( "php-local" =>
   101  #                   ( "php-local" =>
   101  #                     (
   102  #                     (
   102 -#                       "socket" => socket_dir + "/php-fastcgi-1.socket",
   103 -#                       "socket" => socket_dir + "/php-fastcgi-1.socket",