From 47cba8345080894fd494f99cea3e69bda08d27bd Mon Sep 17 00:00:00 2001
From: Steve Dobinson <steve.dobinson@gmail.com>
Date: Tue, 20 Sep 2016 10:34:21 +0100
Subject: [PATCH 1/2] Update lighttpd.conf.debian
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
---
advanced/lighttpd.conf.debian | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/advanced/lighttpd.conf.debian b/advanced/lighttpd.conf.debian
index 8b62f448..81f1b765 100644
--- a/advanced/lighttpd.conf.debian
+++ b/advanced/lighttpd.conf.debian
@@ -12,6 +12,7 @@
server.modules = (
"mod_access",
"mod_accesslog",
+ "mod_auth",
"mod_expire",
"mod_compress",
"mod_redirect",
@@ -59,3 +60,6 @@ $HTTP["url"] =~ "^(?!/admin)/.*" {
# rewrite only js requests
url.rewrite = ("(.*).js" => "pihole/index.js")
}
+
+# Add user chosen options held in external file
+include_shell "cat external.conf 2>/dev/null"
From 737b510116d673dd2799a40a4365ca626867223d Mon Sep 17 00:00:00 2001
From: Steve Dobinson <steve.dobinson@gmail.com>
Date: Tue, 20 Sep 2016 10:38:58 +0100
Subject: [PATCH 2/2] Update lighttpd.conf.fedora
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
---
advanced/lighttpd.conf.fedora | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/advanced/lighttpd.conf.fedora b/advanced/lighttpd.conf.fedora
index 30784b1a..3719d502 100644
--- a/advanced/lighttpd.conf.fedora
+++ b/advanced/lighttpd.conf.fedora
@@ -11,6 +11,7 @@
server.modules = (
"mod_access",
+ "mod_auth",
"mod_fastcgi",
"mod_accesslog",
"mod_expire",
@@ -75,3 +76,6 @@ $HTTP["url"] =~ "^(?!/admin)/.*" {
# rewrite only js requests
url.rewrite = ("(.*).js" => "pihole/index.js")
}
+
+# Add user chosen options held in external file
+include_shell "cat external.conf 2>/dev/null"