From f103452645fe46ca6df22bc4365320749cfb9366 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 7 Apr 2021 15:28:15 +0200
Subject: [SSPS] Fix lighttpd config to be compatible with Debian 9 and 10

---
 .../static_files/lighttpd/etc/lighttpd/lighttpd.conf          | 11 +++++------
 .../static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh      |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'satellit_installer')

diff --git a/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf b/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
index 5cf9d0e..bacf2c9 100644
--- a/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
+++ b/satellit_installer/static_files/lighttpd/etc/lighttpd/lighttpd.conf
@@ -1,9 +1,7 @@
 server.modules = (
 	"mod_access",
 #	"mod_alias",
-	"mod_compress",
 	"mod_deflate",
-	"mod_openssl",
 	"mod_redirect",
 	"mod_rewrite",
 #	"mod_proxy",
@@ -19,12 +17,13 @@ server.port                 = 80
 server.reject-expect-100-with-417 = "disable"
 
 
-index-file.names            = ( "index.php", "index.html", "index.lighttpd.html" )
-url.access-deny             = ( "~", ".inc" )
+index-file.names            = ( "index.php", "index.html" )
+url.access-deny             = ( "~", ".inc", ".git" )
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
-compress.cache-dir          = "/var/cache/lighttpd/compress/"
-compress.filetype           = ( "application/javascript", "text/css", "text/html", "text/plain" )
+deflate.cache-dir          = "/var/cache/lighttpd/compress"
+deflate.mimetypes          = ( "application/javascript", "text/css", "text/html", "text/plain" )
+deflate.compression-level  = 2
 
 # default listening port for IPv6 falls back to the IPv4 port
 include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
diff --git a/satellit_installer/static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh b/satellit_installer/static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh
index 0f88864..fef2268 100755
--- a/satellit_installer/static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh
+++ b/satellit_installer/static_files/lighttpd/usr/share/lighttpd/auto-ssl.sh
@@ -18,6 +18,10 @@ wait
 [ -s "$INTERNAL_CHAIN" ] || INTERNAL_CHAIN=
 readonly INTERNAL_CHAIN
 
+if [ -f "/usr/lib/lighttpd/mod_openssl.so" ]; then
+	echo 'server.modules += ( "mod_openssl" )'
+fi
+
 cat <<HEREDOC
 \$SERVER["socket"] == ":443" {
 	protocol	 = "https://"
@@ -29,11 +33,6 @@ cat <<HEREDOC
 	# Compression is by default off at compile-time, but use if needed
 	# ssl.use-compression	 = "disable"
 
-	# Environment flag for HTTPS enabled
-	setenv.add-environment = (
-		"HTTPS" => "on"
-	)
-
 	# intermediate configuration, tweak to your needs
 	ssl.use-sslv2 = "disable"
 	ssl.use-sslv3 = "disable"
-- 
cgit v1.2.3-55-g7522