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