Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a check for the version number of lighttpd. Only remove the server.modules += section of the new pihole-admin config if the version number is not greater than or equal to 1.4.56

Browse source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2023-01-18 22:12:29 +00:00
parent c992fd48b0
commit 7bb86e4118
No known key found for this signature in database
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
advanced/lighttpd.conf.debian
View file

@ -17,7 +17,6 @@
server.modules = ( server.modules = (
"mod_access", "mod_access",
"mod_accesslog",
"mod_auth", "mod_auth",
"mod_expire", "mod_expire",
"mod_redirect", "mod_redirect",

11
automated install/basic-install.sh
View file

@ -1432,14 +1432,23 @@ installConfigs() {
elif [[ -d "/etc/lighttpd/conf-available" ]]; then elif [[ -d "/etc/lighttpd/conf-available" ]]; then
conf=/etc/lighttpd/conf-available/15-pihole-admin.conf conf=/etc/lighttpd/conf-available/15-pihole-admin.conf
install -D -m 644 -T ${PI_HOLE_LOCAL_REPO}/advanced/pihole-admin.conf $conf install -D -m 644 -T ${PI_HOLE_LOCAL_REPO}/advanced/pihole-admin.conf $conf
# Get the version number of lighttpd
version=$(lighttpd -v | grep -o -E '[0-9]+\.[0-9]+\.[0-9]+')
# Test if that version is greater than or euqal to 1.4.56
if dpkg --compare-versions "$version" "ge" "1.4.56"; then
# If it is, then we don't need to disable the modules
:
else
# disable server.modules += ( ... ) in $conf to avoid module dups # disable server.modules += ( ... ) in $conf to avoid module dups
# (needed until Debian 10 no longer supported by pi-hole)
# (server.modules duplication is ignored in lighttpd 1.4.56+) # (server.modules duplication is ignored in lighttpd 1.4.56+)
if awk '!/^server\.modules/{print}' $conf > $conf.$$ && mv $conf.$$ $conf; then if awk '!/^server\.modules/{print}' $conf > $conf.$$ && mv $conf.$$ $conf; then
: :
else else
rm $conf.$$ rm $conf.$$
fi fi
fi
chmod 644 $conf chmod 644 $conf
if is_command lighty-enable-mod ; then if is_command lighty-enable-mod ; then
lighty-enable-mod pihole-admin access accesslog redirect fastcgi setenv > /dev/null || true lighty-enable-mod pihole-admin access accesslog redirect fastcgi setenv > /dev/null || true