components/lighttpd/patches/lighttpd-conf_file.patch
changeset 331 5001b63ddc8a
child 2934 ed4c692fa932
equal deleted inserted replaced
330:1251baad27f0 331:5001b63ddc8a
       
     1 --- doc/lighttpd.conf-orig	Thu Apr  9 13:02:00 2009
       
     2 +++ doc/lighttpd.conf	Wed Nov  4 03:16:09 2009
       
     3 @@ -36,10 +36,10 @@
       
     4  
       
     5  ## A static document-root. For virtual hosting take a look at the
       
     6  ## mod_simple_vhost module.
       
     7 -server.document-root        = "/srv/www/htdocs/"
       
     8 +server.document-root = "/var/lighttpd/1.4/docroot"
       
     9  
       
    10  ## where to send error-messages to
       
    11 -server.errorlog             = "/var/log/lighttpd/error.log"
       
    12 +server.errorlog = "/var/lighttpd/1.4/logs/error.log"
       
    13  
       
    14  # files to check for if .../ is requested
       
    15  index-file.names            = ( "index.php", "index.html",
       
    16 @@ -46,8 +46,10 @@
       
    17                                  "index.htm", "default.htm" )
       
    18  
       
    19  ## set the event-handler (read the performance section in the manual)
       
    20 -# server.event-handler = "freebsd-kqueue" # needed on OS X
       
    21 +server.event-handler = "solaris-devpoll"
       
    22 +server.network-backend = "writev"
       
    23  
       
    24 +
       
    25  # mimetype mapping
       
    26  mimetype.assign             = (
       
    27    ".pdf"          =>      "application/pdf",
       
    28 @@ -115,7 +117,7 @@
       
    29  # server.tag                 = "lighttpd"
       
    30  
       
    31  #### accesslog module
       
    32 -accesslog.filename          = "/var/log/lighttpd/access.log"
       
    33 +accesslog.filename = "/var/lighttpd/1.4/logs/access.log"
       
    34  
       
    35  ## deny access the file-extensions
       
    36  #
       
    37 @@ -147,7 +149,7 @@
       
    38  #server.error-handler-404   = "/error-handler.php"
       
    39  
       
    40  ## to help the rc.scripts
       
    41 -#server.pid-file            = "/var/run/lighttpd.pid"
       
    42 +server.pid-file = "/var/run/lighttpd14.pid"
       
    43  
       
    44  
       
    45  ###### virtual hosts
       
    46 @@ -160,7 +162,7 @@
       
    47  ## or
       
    48  ##   virtual-server-root + http-host + virtual-server-docroot
       
    49  ##
       
    50 -#simple-vhost.server-root   = "/srv/www/vhosts/"
       
    51 +#simple-vhost.server-root   = "/var/lighttpd/1.4/vhosts/"
       
    52  #simple-vhost.default-host  = "www.example.org"
       
    53  #simple-vhost.document-root = "/htdocs/"
       
    54  
       
    55 @@ -168,8 +170,7 @@
       
    56  ##
       
    57  ## Format: <errorfile-prefix><status-code>.html
       
    58  ## -> ..../status-404.html for 'File not found'
       
    59 -#server.errorfile-prefix    = "/usr/share/lighttpd/errors/status-"
       
    60 -#server.errorfile-prefix    = "/srv/www/errors/status-"
       
    61 +#server.errorfile-prefix    = "/var/lighttpd/1.4/errors/status-"
       
    62  
       
    63  ## virtual directory listings
       
    64  #dir-listing.activate       = "enable"
       
    65 @@ -188,10 +189,10 @@
       
    66  #server.chroot              = "/"
       
    67  
       
    68  ## change uid to <uid> (default: don't care)
       
    69 -#server.username            = "wwwrun"
       
    70 +server.username = "webservd"
       
    71  
       
    72  ## change uid to <uid> (default: don't care)
       
    73 -#server.groupname           = "wwwrun"
       
    74 +server.groupname           = "webservd"
       
    75  
       
    76  #### compress module
       
    77  #compress.cache-dir         = "/var/cache/lighttpd/compress/"
       
    78 @@ -214,8 +215,8 @@
       
    79  #fastcgi.server             = ( ".php" =>
       
    80  #                               ( "localhost" =>
       
    81  #                                 (
       
    82 -#                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
       
    83 -#                                   "bin-path" => "/usr/local/bin/php-cgi"
       
    84 +#                                   "socket" => "/tmp/lighttpd/php-fastcgi.socket",
       
    85 +#                                   "bin-path" => "/usr/php/bin/php-cgi"
       
    86  #                                 )
       
    87  #                               )
       
    88  #                            )
       
    89 @@ -274,7 +275,7 @@
       
    90  # %3 => subdomain 1 name
       
    91  # %4 => subdomain 2 name
       
    92  #
       
    93 -#evhost.path-pattern        = "/srv/www/vhosts/%3/htdocs/"
       
    94 +#evhost.path-pattern        = "/var/lighttpd/1.4/vhosts/%3/htdocs/"
       
    95  
       
    96  #### expire module
       
    97  #expire.url                 = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
       
    98 @@ -312,8 +313,8 @@
       
    99  #index-file.names += (foo + ".php")
       
   100  
       
   101  #### include
       
   102 -#include /etc/lighttpd/lighttpd-inc.conf
       
   103 -## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
       
   104 +#include /etc/lighttpd/1.4/lighttpd-inc.conf
       
   105 +## same as above if you run: "lighttpd -f /etc/lighttpd/1.4/lighttpd.conf"
       
   106  #include "lighttpd-inc.conf"
       
   107  
       
   108  #### include_shell
       
   109 @@ -320,3 +321,5 @@
       
   110  #include_shell "echo var.a=1"
       
   111  ## the above is same as:
       
   112  #var.a=1
       
   113 +# Set the directory used for file uploads to /tmp
       
   114 +server.upload-dirs = ( "/tmp" )