1 --- doc/lighttpd.conf-orig Thu Apr 9 13:02:00 2009 |
1 --- doc/config/lighttpd.conf 2014-01-22 05:36:22.027115196 -0800 |
2 +++ doc/lighttpd.conf Wed Nov 4 03:16:09 2009 |
2 +++ doc/config/lighttpd.conf 2014-01-22 05:34:05.471641339 -0800 |
3 @@ -36,10 +36,10 @@ |
3 @@ -13,11 +13,11 @@ |
|
4 ## if you add a variable here. Add the corresponding variable in the |
|
5 ## chroot example aswell. |
|
6 ## |
|
7 -var.log_root = "/var/log/lighttpd" |
|
8 -var.server_root = "/srv/www" |
|
9 -var.state_dir = "/var/run" |
|
10 -var.home_dir = "/var/lib/lighttpd" |
|
11 -var.conf_dir = "/etc/lighttpd" |
|
12 +var.log_root = "/var/lighttpd/1.4/logs" |
|
13 +var.server_root = "/var/lighttpd/1.4" |
|
14 +var.state_dir = log_root |
|
15 +var.home_dir = server_root |
|
16 +var.conf_dir = "/etc/lighttpd/1.4" |
4 |
17 |
5 ## A static document-root. For virtual hosting take a look at the |
18 ## |
6 ## mod_simple_vhost module. |
19 ## run the server chrooted. |
7 -server.document-root = "/srv/www/htdocs/" |
20 @@ -58,7 +58,7 @@ |
8 +server.document-root = "/var/lighttpd/1.4/docroot" |
21 ## used in: |
|
22 ## conf.d/compress.conf |
|
23 ## |
|
24 -var.cache_dir = "/var/cache/lighttpd" |
|
25 +var.cache_dir = server_root + "/cache" |
9 |
26 |
10 ## where to send error-messages to |
27 ## |
11 -server.errorlog = "/var/log/lighttpd/error.log" |
28 ## Base directory for sockets. |
12 +server.errorlog = "/var/lighttpd/1.4/logs/error.log" |
29 @@ -101,8 +101,8 @@ |
|
30 ## Run as a different username/groupname. |
|
31 ## This requires root permissions during startup. |
|
32 ## |
|
33 -server.username = "lighttpd" |
|
34 -server.groupname = "lighttpd" |
|
35 +server.username = "webservd" |
|
36 +server.groupname = "webservd" |
13 |
37 |
14 # files to check for if .../ is requested |
38 ## |
15 index-file.names = ( "index.php", "index.html", |
39 ## enable core files. |
16 @@ -46,8 +46,10 @@ |
40 @@ -112,7 +112,7 @@ |
17 "index.htm", "default.htm" ) |
41 ## |
|
42 ## Document root |
|
43 ## |
|
44 -server.document-root = server_root + "/htdocs" |
|
45 +server.document-root = server_root + "/docroot" |
18 |
46 |
19 ## set the event-handler (read the performance section in the manual) |
47 ## |
20 -# server.event-handler = "freebsd-kqueue" # needed on OS X |
48 ## The value for the "Server:" response field. |
|
49 @@ -124,7 +124,8 @@ |
|
50 ## |
|
51 ## store a pid file |
|
52 ## |
|
53 -server.pid-file = state_dir + "/lighttpd.pid" |
|
54 +# There must be full path in order to SMF methods work properly |
|
55 +server.pid-file = "/var/lighttpd/1.4/logs/lighttpd14.pid" |
|
56 |
|
57 ## |
|
58 ####################################################################### |
|
59 @@ -178,7 +178,7 @@ |
|
60 ## |
|
61 ## linux-sysepoll is recommended on kernel 2.6. |
|
62 ## |
|
63 -server.event-handler = "linux-sysepoll" |
21 +server.event-handler = "solaris-devpoll" |
64 +server.event-handler = "solaris-devpoll" |
22 +server.network-backend = "writev" |
|
23 |
65 |
24 + |
66 ## |
25 # mimetype mapping |
67 ## The basic network interface for all platforms at the syscalls read() |
26 mimetype.assign = ( |
68 @@ -188,7 +188,7 @@ |
27 ".pdf" => "application/pdf", |
69 ## linux-sendfile - is recommended for small files. |
28 @@ -115,7 +117,7 @@ |
70 ## writev - is recommended for sending many large files |
29 # server.tag = "lighttpd" |
71 ## |
|
72 -server.network-backend = "linux-sendfile" |
|
73 +server.network-backend = "solaris-sendfilev" |
30 |
74 |
31 #### accesslog module |
75 ## |
32 -accesslog.filename = "/var/log/lighttpd/access.log" |
76 ## As lighttpd is a single-threaded server, its main resource limit is |
33 +accesslog.filename = "/var/lighttpd/1.4/logs/access.log" |
77 @@ -296,7 +296,7 @@ |
|
78 ## "index.htm", "default.htm" ) |
|
79 ## |
|
80 index-file.names += ( |
|
81 - "index.xhtml", "index.html", "index.htm", "default.htm", "index.php" |
|
82 + "index.php", "index.html", "index.htm", "default.htm", "index.xhtml" |
|
83 ) |
34 |
84 |
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 ## |
85 ## |
50 -#simple-vhost.server-root = "/srv/www/vhosts/" |
86 @@ -345,7 +345,7 @@ |
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 |
87 ## Format: <errorfile-prefix><status-code>.html |
58 ## -> ..../status-404.html for 'File not found' |
88 ## -> ..../status-404.html for 'File not found' |
59 -#server.errorfile-prefix = "/usr/share/lighttpd/errors/status-" |
89 ## |
60 -#server.errorfile-prefix = "/srv/www/errors/status-" |
90 -#server.errorfile-prefix = "/srv/www/htdocs/errors/status-" |
61 +#server.errorfile-prefix = "/var/lighttpd/1.4/errors/status-" |
91 +#server.errorfile-prefix = "/var/lighttpd/1.4/errors/status-" |
62 |
92 |
63 ## virtual directory listings |
93 ## |
64 #dir-listing.activate = "enable" |
94 ## mimetype mapping |
65 @@ -188,10 +189,10 @@ |
95 116,128d121 |
66 #server.chroot = "/" |
96 --- doc/config/conf.d/fastcgi.conf 2013-10-07 07:21:24.418114603 -0700 |
67 |
97 +++ doc/config/conf.d/fastcgi.conf 2013-10-07 07:24:01.824986033 -0700 |
68 ## change uid to <uid> (default: don't care) |
98 @@ -22,8 +22,8 @@ |
69 -#server.username = "wwwrun" |
99 #fastcgi.server = ( ".php" => |
70 +server.username = "webservd" |
100 # ( "php-local" => |
71 |
101 # ( |
72 ## change uid to <uid> (default: don't care) |
102 -# "socket" => socket_dir + "/php-fastcgi-1.socket", |
73 -#server.groupname = "wwwrun" |
103 -# "bin-path" => server_root + "/cgi-bin/php5", |
74 +server.groupname = "webservd" |
104 +# "socket" => socket_dir + "/php-fastcgi.socket", |
75 |
105 +# "bin-path" => "/usr/php/bin/php-cgi", |
76 #### compress module |
106 # "max-procs" => 1, |
77 #compress.cache-dir = "/var/cache/lighttpd/compress/" |
107 # "broken-scriptfilename" => "enable", |
78 @@ -214,8 +215,8 @@ |
108 # ) |
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" ) |
|