1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798 |
- Modify the default lighttpd configuration file to have one a starting conf
- * Changed the log path to /var/log and logs filenames
- * Disable IPv6
- * Do not setuid to a user that doesn't exist on the system
- * Disable pdf ranges fix for Adobe Reader since it uses regex and we
- don't always have pcre support
- * Change the network backend to writev since linux-sendfile fails on buildroot
- Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
- Signed-off-by: Simon Dawson <spdawson@gmail.com>
- diff -Nurp a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf
- --- a/doc/config/conf.d/access_log.conf 2010-07-11 18:01:32.000000000 +0100
- +++ b/doc/config/conf.d/access_log.conf 2012-07-21 19:37:58.453207990 +0100
- @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" )
- ##
- ## Default access log.
- ##
- -accesslog.filename = log_root + "/access.log"
- +accesslog.filename = log_root + "/lighttpd-access.log"
-
- ##
- ## The default format produces CLF compatible output.
- diff -Nurp a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
- --- a/doc/config/lighttpd.conf 2011-12-18 12:57:25.000000000 +0000
- +++ b/doc/config/lighttpd.conf 2012-07-21 19:40:45.281200552 +0100
- @@ -13,8 +13,8 @@
- ## if you add a variable here. Add the corresponding variable in the
- ## chroot example aswell.
- ##
- -var.log_root = "/var/log/lighttpd"
- -var.server_root = "/srv/www"
- +var.log_root = "/var/log"
- +var.server_root = "/var/www"
- var.state_dir = "/var/run"
- var.home_dir = "/var/lib/lighttpd"
- var.conf_dir = "/etc/lighttpd"
- @@ -90,7 +90,7 @@ server.port = 80
- ##
- ## Use IPv6?
- ##
- -server.use-ipv6 = "enable"
- +# server.use-ipv6 = "enable"
-
- ##
- ## bind to a specific IP
- @@ -101,8 +101,8 @@ server.use-ipv6 = "enable"
- ## Run as a different username/groupname.
- ## This requires root permissions during startup.
- ##
- -server.username = "lighttpd"
- -server.groupname = "lighttpd"
- +server.username = "www-data"
- +server.groupname = "www-data"
-
- ##
- ## enable core files.
- @@ -112,7 +112,7 @@ server.groupname = "lighttpd"
- ##
- ## Document root
- ##
- -server.document-root = server_root + "/htdocs"
- +server.document-root = server_root
-
- ##
- ## The value for the "Server:" response field.
- @@ -138,7 +138,7 @@ server.pid-file = state_dir + "/lighttpd
- ##
- ## Path to the error log file
- ##
- -server.errorlog = log_root + "/error.log"
- +server.errorlog = log_root + "/lighttpd-error.log"
-
- ##
- ## If you want to log to syslog you have to unset the
- @@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll"
- ## linux-sendfile - is recommended for small files.
- ## writev - is recommended for sending many large files
- ##
- -server.network-backend = "linux-sendfile"
- +server.network-backend = "writev"
-
- ##
- ## As lighttpd is a single-threaded server, its main resource limit is
- @@ -311,9 +311,9 @@ url.access-deny = ( "~", ".i
- ## disable range requests for pdf files
- ## workaround for a bug in the Acrobat Reader plugin.
- ##
- -$HTTP["url"] =~ "\.pdf$" {
- - server.range-requests = "disable"
- -}
- +# $HTTP["url"] =~ "\.pdf$" {
- +# server.range-requests = "disable"
- +# }
-
- ##
- ## url handling modules (rewrite, redirect)
|