@ -327,7 +327,7 @@ if is_command apt-get ; then
# Packages required to perfom the os_check (stored as an array)
OS_CHECK_DEPS = ( grep dnsutils)
# Packages required to run this install script (stored as an array)
INSTALLER_DEPS = ( git " ${ iproute_pkg } " whiptail)
INSTALLER_DEPS = ( git " ${ iproute_pkg } " whiptail ca-certificates )
# Packages required to run Pi-hole (stored as an array)
PIHOLE_DEPS = ( cron curl iputils-ping lsof netcat psmisc sudo unzip idn2 sqlite3 libcap2-bin dns-root-data libcap2)
# Packages required for the Web admin interface (stored as an array)
@ -373,18 +373,29 @@ elif is_command rpm ; then
PKG_INSTALL = ( " ${ PKG_MANAGER } " install -y)
PKG_COUNT = " ${ PKG_MANAGER } check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l "
OS_CHECK_DEPS = ( grep bind-utils)
INSTALLER_DEPS = ( git iproute newt procps-ng which chkconfig)
INSTALLER_DEPS = ( git iproute newt procps-ng which chkconfig ca-certificates )
PIHOLE_DEPS = ( cronie curl findutils nmap-ncat sudo unzip libidn2 psmisc sqlite libcap lsof)
PIHOLE_WEB_DEPS = ( lighttpd lighttpd-fastcgi php-common php-cli php-pdo php-xml php-json php-intl)
LIGHTTPD_USER = "lighttpd"
LIGHTTPD_GROUP = "lighttpd"
LIGHTTPD_CFG = "lighttpd.conf.fedora"
# If the host OS is Fedora,
if grep -qiE 'fedora|fedberry' /etc/redhat-release; then
# If neither apt-get or yum/dnf package managers were found
else
# it's not an OS we can support,
printf " %b OS distribution not supported\\n" " ${ CROSS } "
# so exit the installer
exit
fi
}
select_rpm_php( ) {
# If the host OS is Fedora,
if grep -qiE 'fedora|fedberry' /etc/redhat-release; then
# all required packages should be available by default with the latest fedora release
: # continue
# or if host OS is CentOS,
elif grep -qiE 'centos|scientific' /etc/redhat-release; then
# or if host OS is CentOS,
elif grep -qiE 'centos|scientific' /etc/redhat-release; then
# Pi-Hole currently supports CentOS 7+ with PHP7+
SUPPORTED_CENTOS_VERSION = 7
SUPPORTED_CENTOS_PHP_VERSION = 7
@ -451,24 +462,14 @@ elif is_command rpm ; then
exit 1
fi
fi
fi
fi
else
# Warn user of unsupported version of Fedora or CentOS
fi # Warn user of unsupported version of Fedora or CentOS
if ! whiptail --defaultno --title "Unsupported RPM based distribution" --yesno "Would you like to continue installation on an unsupported RPM based distribution?\\n\\nPlease ensure the following packages have been installed manually:\\n\\n- lighttpd\\n- lighttpd-fastcgi\\n- PHP version 7+" " ${ r } " " ${ c } " ; then
printf " %b Aborting installation due to unsupported RPM based distribution\\n" " ${ CROSS } "
exit
else
printf " %b Continuing installation with unsupported RPM based distribution\\n" " ${ INFO } "
fi
fi
# If neither apt-get or yum/dnf package managers were found
else
# it's not an OS we can support,
printf " %b OS distribution not supported\\n" " ${ CROSS } "
# so exit the installer
exit
fi
fi
}
@ -1813,6 +1814,8 @@ finalExports() {
echo " INSTALL_WEB_INTERFACE= ${ INSTALL_WEB_INTERFACE } "
echo " LIGHTTPD_ENABLED= ${ LIGHTTPD_ENABLED } "
echo " CACHE_SIZE= ${ CACHE_SIZE } "
echo "DNS_FQDN_REQUIRED=true"
echo "DNS_BOGUS_PRIV=true"
} >> " ${ setupVars } "
chmod 644 " ${ setupVars } "
@ -2547,6 +2550,11 @@ main() {
printf " %b Checking for / installing Required dependencies for this install script...\\n" " ${ INFO } "
install_dependent_packages " ${ INSTALLER_DEPS [@] } "
#In case of RPM based distro, select the proper PHP version
if [ [ " $PKG_MANAGER " = = "yum" || " $PKG_MANAGER " = = "dnf" ] ] ; then
select_rpm_php
fi
# Check if SELinux is Enforcing
checkSelinux
Adam Warner
3 years ago
committed by