diff --git a/advanced/lighttpd.conf b/advanced/lighttpd.conf.debian similarity index 97% rename from advanced/lighttpd.conf rename to advanced/lighttpd.conf.debian index f899350a..c6a9af69 100644 --- a/advanced/lighttpd.conf +++ b/advanced/lighttpd.conf.debian @@ -14,9 +14,9 @@ server.modules = ( "mod_accesslog", "mod_expire", "mod_compress", - "mod_redirect", - "mod_setenv", - "mod_rewrite" + "mod_redirect", + "mod_setenv", + "mod_rewrite" ) server.document-root = "/var/www/html" diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 495eea5d..ea186887 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -68,6 +68,7 @@ if [ -x "$(command -v rpm)" ];then PKG_COUNT="$PKG_MANAGER check-update | grep -v ^Last | grep -c ^[a-zA-Z0-9]" INSTALLER_DEPS=( iproute procps-ng newt dhcpcd ) PIHOLE_DEPS=( bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php git curl unzip wget findutils cronie ) + LIGHTTPD_CFG="lighttpd.conf.fedora" package_check() { rpm -qa | grep ^$1- > /dev/null } @@ -81,6 +82,7 @@ elif [ -x "$(command -v apt-get)" ];then PKG_COUNT="$PKG_MANAGER -s -o Debug::NoLocking=true upgrade | grep -c ^Inst" INSTALLER_DEPS=( apt-utils whiptail ) PIHOLE_DEPS=( dhcpcd dnsutils bc dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget ) + LIGHTTPD_CFG="lighttpd.conf.debian" package_check() { dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed" } @@ -536,7 +538,7 @@ installConfigs() { $SUDO chown "$USER":root /etc/lighttpd $SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig fi - $SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf + $SUDO cp /etc/.pihole/advanced/$LIGHTTPD_CFG /etc/lighttpd/lighttpd.conf } stopServices() {