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

Merge pull request #2277 from bcambl/centos_fedora_fixes

Browse source 
Installer fixes for Fedora & CentOS
This commit is contained in:
Mark Drobnak 2018-07-17 22:06:25 -04:00 committed by GitHub
commit ec30df2020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
automated install/basic-install.sh
View file

@ -244,7 +244,8 @@ elif command -v rpm &> /dev/null; then
# If the host OS is Fedora, # If the host OS is Fedora,
if grep -qi 'fedora' /etc/redhat-release; then if grep -qi 'fedora' /etc/redhat-release; then
# all required packages should be available by default with the latest fedora release # all required packages should be available by default with the latest fedora release
: # continue # ensure 'php-json' is installed on Fedora (installed as dependency on CentOS7 + Remi repository)
PIHOLE_WEB_DEPS+=('php-json')
# or if host OS is CentOS, # or if host OS is CentOS,
elif grep -qi 'centos' /etc/redhat-release; then elif grep -qi 'centos' /etc/redhat-release; then
# Pi-Hole currently supports CentOS 7+ with PHP7+ # Pi-Hole currently supports CentOS 7+ with PHP7+
@ -291,6 +292,13 @@ elif command -v rpm &> /dev/null; then
"${PKG_INSTALL[@]}" "yum-utils" &> /dev/null "${PKG_INSTALL[@]}" "yum-utils" &> /dev/null
yum-config-manager --enable ${REMI_REPO} &> /dev/null yum-config-manager --enable ${REMI_REPO} &> /dev/null
echo -e " ${TICK} Remi's RPM repository has been enabled for PHP7" echo -e " ${TICK} Remi's RPM repository has been enabled for PHP7"
# trigger an install/update of PHP to ensure previous version of PHP is updated from REMI
if "${PKG_INSTALL[@]}" "php-cli" &> /dev/null; then
echo -e " ${TICK} PHP7 installed/updated via Remi's RPM repository"
else
echo -e " ${CROSS} There was a problem updating to PHP7 via Remi's RPM repository"
exit 1
fi
fi fi
fi fi
fi fi