|
|
@ -105,7 +105,7 @@ if command -v apt-get &> /dev/null; then
|
|
|
|
phpVer="php5"
|
|
|
|
phpVer="php5"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
# #########################################
|
|
|
|
# #########################################
|
|
|
|
INSTALLER_DEPS=(apt-utils debconf dhcpcd5 git ${iproute_pkg} whiptail)
|
|
|
|
INSTALLER_DEPS=(apt-utils dialog debconf dhcpcd5 git ${iproute_pkg} whiptail)
|
|
|
|
PIHOLE_DEPS=(bc cron curl dnsmasq dnsutils iputils-ping lsof netcat sudo unzip wget)
|
|
|
|
PIHOLE_DEPS=(bc cron curl dnsmasq dnsutils iputils-ping lsof netcat sudo unzip wget)
|
|
|
|
PIHOLE_WEB_DEPS=(lighttpd ${phpVer}-common ${phpVer}-cgi)
|
|
|
|
PIHOLE_WEB_DEPS=(lighttpd ${phpVer}-common ${phpVer}-cgi)
|
|
|
|
LIGHTTPD_USER="www-data"
|
|
|
|
LIGHTTPD_USER="www-data"
|
|
|
@ -136,7 +136,7 @@ elif command -v rpm &> /dev/null; then
|
|
|
|
UPDATE_PKG_CACHE=":"
|
|
|
|
UPDATE_PKG_CACHE=":"
|
|
|
|
PKG_INSTALL=(${PKG_MANAGER} install -y)
|
|
|
|
PKG_INSTALL=(${PKG_MANAGER} install -y)
|
|
|
|
PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l"
|
|
|
|
PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l"
|
|
|
|
INSTALLER_DEPS=(git iproute net-tools newt procps-ng)
|
|
|
|
INSTALLER_DEPS=(dialog git iproute net-tools newt procps-ng)
|
|
|
|
PIHOLE_DEPS=(bc bind-utils cronie curl dnsmasq findutils nmap-ncat sudo unzip wget)
|
|
|
|
PIHOLE_DEPS=(bc bind-utils cronie curl dnsmasq findutils nmap-ncat sudo unzip wget)
|
|
|
|
PIHOLE_WEB_DEPS=(lighttpd lighttpd-fastcgi php php-common php-cli)
|
|
|
|
PIHOLE_WEB_DEPS=(lighttpd lighttpd-fastcgi php php-common php-cli)
|
|
|
|
if ! grep -q 'Fedora' /etc/redhat-release; then
|
|
|
|
if ! grep -q 'Fedora' /etc/redhat-release; then
|
|
|
@ -1413,7 +1413,8 @@ main() {
|
|
|
|
pw=""
|
|
|
|
pw=""
|
|
|
|
if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
|
|
|
|
if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
|
|
|
|
pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
|
|
|
|
pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
|
|
|
|
/usr/local/bin/pihole -a -p "${pw}"
|
|
|
|
. /opt/pihole/webpage.sh
|
|
|
|
|
|
|
|
echo "WEBPASSWORD=$(HashPassword ${pw})" >> ${setupVars}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|