From 357f5a2cfd2a4eb0a98fcbfaec80a369e43d1d90 Mon Sep 17 00:00:00 2001
From: ProtoFoo <ProtoFoo@users.noreply.github.com>
Date: Thu, 9 Feb 2017 16:46:55 +0100
Subject: [PATCH 1/2] Add manual edit warning
Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
---
advanced/lighttpd.conf.debian | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/advanced/lighttpd.conf.debian b/advanced/lighttpd.conf.debian
index 01f52a85..53db2167 100644
--- a/advanced/lighttpd.conf.debian
+++ b/advanced/lighttpd.conf.debian
@@ -9,6 +9,14 @@
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
+###############################################################################
+# FILE AUTOMATICALLY OVERWRITTEN BY PI-HOLE INSTALL/UPDATE PROCEDURE. #
+# ANY CHANGES MADE TO THIS FILE AFTER INSTALL WILL BE LOST ON THE NEXT UPDATE #
+# #
+# CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE: #
+# /etc/lighttpd/external.conf #
+###############################################################################
+
server.modules = (
"mod_access",
"mod_accesslog",
@@ -21,15 +29,15 @@ server.modules = (
)
server.document-root = "/var/www/html"
-server.error-handler-404 = "pihole/index.php"
+server.error-handler-404 = "pihole/index.php"
server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
server.errorlog = "/var/log/lighttpd/error.log"
server.pid-file = "/var/run/lighttpd.pid"
server.username = "www-data"
server.groupname = "www-data"
server.port = 80
-accesslog.filename = "/var/log/lighttpd/access.log"
-accesslog.format = "%{%s}t|%V|%r|%s|%b"
+accesslog.filename = "/var/log/lighttpd/access.log"
+accesslog.format = "%{%s}t|%V|%r|%s|%b"
index-file.names = ( "index.php", "index.html", "index.lighttpd.html" )
From 162d9d7d57aaabd1ca5a91b4a9826f9951616169 Mon Sep 17 00:00:00 2001
From: ProtoFoo <ProtoFoo@users.noreply.github.com>
Date: Thu, 9 Feb 2017 17:00:52 +0100
Subject: [PATCH 2/2] Add manual edit warning
Added text block from 01-pihole.conf to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
---
advanced/lighttpd.conf.fedora | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/advanced/lighttpd.conf.fedora b/advanced/lighttpd.conf.fedora
index d2af5bd4..6c5b035b 100644
--- a/advanced/lighttpd.conf.fedora
+++ b/advanced/lighttpd.conf.fedora
@@ -9,6 +9,14 @@
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
+###############################################################################
+# FILE AUTOMATICALLY OVERWRITTEN BY PI-HOLE INSTALL/UPDATE PROCEDURE. #
+# ANY CHANGES MADE TO THIS FILE AFTER INSTALL WILL BE LOST ON THE NEXT UPDATE #
+# #
+# CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE: #
+# /etc/lighttpd/external.conf #
+###############################################################################
+
server.modules = (
"mod_access",
"mod_auth",
@@ -22,15 +30,15 @@ server.modules = (
)
server.document-root = "/var/www/html"
-server.error-handler-404 = "pihole/index.php"
+server.error-handler-404 = "pihole/index.php"
server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
server.errorlog = "/var/log/lighttpd/error.log"
server.pid-file = "/var/run/lighttpd.pid"
server.username = "lighttpd"
server.groupname = "lighttpd"
server.port = 80
-accesslog.filename = "/var/log/lighttpd/access.log"
-accesslog.format = "%{%s}t|%V|%r|%s|%b"
+accesslog.filename = "/var/log/lighttpd/access.log"
+accesslog.format = "%{%s}t|%V|%r|%s|%b"
index-file.names = ( "index.php", "index.html", "index.lighttpd.html" )