|
@@ -1,4 +1,4 @@
|
|
|
-From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001
|
|
|
+From bb0a1cc656b2df4184a0794fb67ae74c634c1ecd Mon Sep 17 00:00:00 2001
|
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
|
Date: Mon, 13 Dec 2021 22:07:17 +0100
|
|
|
Subject: [PATCH] Modify the default lighttpd configuration file to have one a
|
|
@@ -15,16 +15,18 @@ Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
[Thomas: update for 1.4.69 - drop server.use-ipv6]
|
|
|
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
|
|
+[Thomas: update for 1.4.77 - move lighttpd.conf to lighttpd.annotated.conf]
|
|
|
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
|
|
---
|
|
|
- doc/config/conf.d/access_log.conf | 2 +-
|
|
|
- doc/config/lighttpd.conf | 14 +++++++-------
|
|
|
+ doc/config/conf.d/access_log.conf | 2 +-
|
|
|
+ doc/config/lighttpd.annotated.conf | 14 +++++++-------
|
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
|
|
diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf
|
|
|
-index e685d437..92cff4f0 100644
|
|
|
+index f8294802..9886cddf 100644
|
|
|
--- a/doc/config/conf.d/access_log.conf
|
|
|
+++ b/doc/config/conf.d/access_log.conf
|
|
|
-@@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" )
|
|
|
+@@ -7,7 +7,7 @@ server.modules += ( "mod_accesslog" )
|
|
|
##
|
|
|
## Default access log.
|
|
|
##
|
|
@@ -33,10 +35,10 @@ index e685d437..92cff4f0 100644
|
|
|
|
|
|
##
|
|
|
## The default format produces CLF compatible output.
|
|
|
-diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
|
|
|
-index d45a284d..4e926d5a 100644
|
|
|
---- a/doc/config/lighttpd.conf
|
|
|
-+++ b/doc/config/lighttpd.conf
|
|
|
+diff --git a/doc/config/lighttpd.annotated.conf b/doc/config/lighttpd.annotated.conf
|
|
|
+index c94f703b..35263a1e 100644
|
|
|
+--- a/doc/config/lighttpd.annotated.conf
|
|
|
++++ b/doc/config/lighttpd.annotated.conf
|
|
|
@@ -13,8 +13,8 @@
|
|
|
## if you add a variable here. Add the corresponding variable in the
|
|
|
## chroot example as well.
|
|
@@ -48,9 +50,9 @@ index d45a284d..4e926d5a 100644
|
|
|
var.state_dir = "/run"
|
|
|
var.home_dir = "/var/lib/lighttpd"
|
|
|
var.conf_dir = "/etc/lighttpd"
|
|
|
-@@ -97,8 +97,8 @@ server.port = 80
|
|
|
+@@ -97,8 +97,8 @@ include conf_dir + "/modules.conf"
|
|
|
## Run as a different username/groupname.
|
|
|
- ## This requires root permissions during startup.
|
|
|
+ ## This requires root permissions during startup.
|
|
|
##
|
|
|
-server.username = "lighttpd"
|
|
|
-server.groupname = "lighttpd"
|
|
@@ -76,10 +78,10 @@ index d45a284d..4e926d5a 100644
|
|
|
+server.errorlog = log_root + "/lighttpd-error.log"
|
|
|
|
|
|
##
|
|
|
- ## If you want to log to syslog you have to unset the
|
|
|
+ ## If you want to log to syslog you have to unset the
|
|
|
@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf"
|
|
|
## and write(). Every modern OS provides its own syscall to help network
|
|
|
- ## servers transfer files as fast as possible
|
|
|
+ ## servers transfer files as fast as possible
|
|
|
##
|
|
|
-#server.network-backend = "sendfile"
|
|
|
+server.network-backend = "writev"
|
|
@@ -87,5 +89,5 @@ index d45a284d..4e926d5a 100644
|
|
|
##
|
|
|
## As lighttpd is a single-threaded server, its main resource limit is
|
|
|
--
|
|
|
-2.39.0
|
|
|
+2.43.0
|
|
|
|