author | Jiri Kukacka <jiri.kukacka@oracle.com> |
Tue, 14 Jan 2014 08:01:05 -0800 | |
branch | s11u1-sru |
changeset 2934 | ed4c692fa932 |
parent 331 | 5001b63ddc8a |
child 3190 | 44a15b136f48 |
permissions | -rw-r--r-- |
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
1 |
--- doc/config/lighttpd.conf 2014-01-22 05:36:22.027115196 -0800 |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
2 |
+++ doc/config/lighttpd.conf 2014-01-22 05:34:05.471641339 -0800 |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
3 |
@@ -13,11 +13,11 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
4 |
## if you add a variable here. Add the corresponding variable in the |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
5 |
## chroot example aswell. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
6 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
7 |
-var.log_root = "/var/log/lighttpd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
8 |
-var.server_root = "/srv/www" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
9 |
-var.state_dir = "/var/run" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
10 |
-var.home_dir = "/var/lib/lighttpd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
11 |
-var.conf_dir = "/etc/lighttpd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
12 |
+var.log_root = "/var/lighttpd/1.4/logs" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
13 |
+var.server_root = "/var/lighttpd/1.4" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
14 |
+var.state_dir = log_root |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
15 |
+var.home_dir = server_root |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
16 |
+var.conf_dir = "/etc/lighttpd/1.4" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
18 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
19 |
## run the server chrooted. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
20 |
@@ -58,7 +58,7 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
21 |
## used in: |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
22 |
## conf.d/compress.conf |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
23 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
24 |
-var.cache_dir = "/var/cache/lighttpd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
25 |
+var.cache_dir = server_root + "/cache" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
27 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
28 |
## Base directory for sockets. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
29 |
@@ -101,8 +101,8 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
30 |
## Run as a different username/groupname. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
31 |
## This requires root permissions during startup. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
32 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
33 |
-server.username = "lighttpd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
34 |
-server.groupname = "lighttpd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
35 |
+server.username = "webservd" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
36 |
+server.groupname = "webservd" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
38 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
39 |
## enable core files. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
40 |
@@ -112,7 +112,7 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
41 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
42 |
## Document root |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
43 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
44 |
-server.document-root = server_root + "/htdocs" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
45 |
+server.document-root = server_root + "/docroot" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
47 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
48 |
## The value for the "Server:" response field. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
49 |
@@ -124,7 +124,8 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
50 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
51 |
## store a pid file |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
52 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
53 |
-server.pid-file = state_dir + "/lighttpd.pid" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
54 |
+# There must be full path in order to SMF methods work properly |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
55 |
+server.pid-file = "/var/lighttpd/1.4/logs/lighttpd14.pid" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
57 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
58 |
####################################################################### |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
59 |
@@ -178,7 +178,7 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
60 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
61 |
## linux-sysepoll is recommended on kernel 2.6. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
62 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
63 |
-server.event-handler = "linux-sysepoll" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
64 |
+server.event-handler = "solaris-devpoll" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
65 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
66 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
67 |
## The basic network interface for all platforms at the syscalls read() |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
68 |
@@ -188,7 +188,7 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
69 |
## linux-sendfile - is recommended for small files. |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
70 |
## writev - is recommended for sending many large files |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
71 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
72 |
-server.network-backend = "linux-sendfile" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
73 |
+server.network-backend = "solaris-sendfilev" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
74 |
|
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
75 |
## |
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
76 |
## As lighttpd is a single-threaded server, its main resource limit is |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
77 |
@@ -296,7 +296,7 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
78 |
## "index.htm", "default.htm" ) |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
79 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
80 |
index-file.names += ( |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
81 |
- "index.xhtml", "index.html", "index.htm", "default.htm", "index.php" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
82 |
+ "index.php", "index.html", "index.htm", "default.htm", "index.xhtml" |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
83 |
) |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
84 |
|
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
85 |
## |
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
86 |
@@ -345,7 +345,7 @@ |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
87 |
## Format: <errorfile-prefix><status-code>.html |
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
88 |
## -> ..../status-404.html for 'File not found' |
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
89 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
90 |
-#server.errorfile-prefix = "/srv/www/htdocs/errors/status-" |
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
91 |
+#server.errorfile-prefix = "/var/lighttpd/1.4/errors/status-" |
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
92 |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
93 |
## |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
94 |
## mimetype mapping |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
95 |
116,128d121 |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
96 |
--- doc/config/conf.d/fastcgi.conf 2013-10-07 07:21:24.418114603 -0700 |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
97 |
+++ doc/config/conf.d/fastcgi.conf 2013-10-07 07:24:01.824986033 -0700 |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
98 |
@@ -22,8 +22,8 @@ |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
99 |
#fastcgi.server = ( ".php" => |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
100 |
# ( "php-local" => |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
101 |
# ( |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
102 |
-# "socket" => socket_dir + "/php-fastcgi-1.socket", |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
103 |
-# "bin-path" => server_root + "/cgi-bin/php5", |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
104 |
+# "socket" => socket_dir + "/php-fastcgi.socket", |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
105 |
+# "bin-path" => "/usr/php/bin/php-cgi", |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
106 |
# "max-procs" => 1, |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
107 |
# "broken-scriptfilename" => "enable", |
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
108 |
# ) |