arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

lighttpd: use file glob for optional external.conf

Browse Source 
lighttpd 1.4.50 config parse will error if include_shell exits non-zero
and pi-hole sample config: include_shell "cat external.conf 2>/dev/null"
is an error if external.conf does not exist

Replace with: include "external*.conf"
file glob supported since lighttpd 1.4.40 and is not an error if there
is no file which matches the file glob

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
This commit is contained in:
Glenn Strauss 2018-10-17 06:23:34 -04:00
parent a79dff3d98
commit 69b2a5a876
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
advanced/lighttpd.conf.debian
View File

@ -72,4 +72,5 @@ $HTTP["url"] =~ "^/admin/\.(.*)" {
}
# Add user chosen options held in external file
include_shell "cat external.conf 2>/dev/null"
# (use file glob for optional file)
include "external*.conf"

3
advanced/lighttpd.conf.fedora
View File

@ -90,4 +90,5 @@ $HTTP["url"] =~ "^/admin/\.(.*)" {
}
# Add user chosen options held in external file
include_shell "cat external.conf 2>/dev/null"
# (use file glob for optional file)
include "external*.conf"