From 2bf6b29b8fc2a29834ca07422fd50539199a6920 Mon Sep 17 00:00:00 2001 From: bcambl Date: Sun, 15 Jul 2018 13:05:07 -0600 Subject: [PATCH 1/2] trigger an install/upgrade of PHP after enabling the Remi repository Signed-off-by: bcambl --- automated install/basic-install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index dd0c6392..c6c83e74 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -291,6 +291,13 @@ elif command -v rpm &> /dev/null; then "${PKG_INSTALL[@]}" "yum-utils" &> /dev/null yum-config-manager --enable ${REMI_REPO} &> /dev/null 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 From fa9ecbdb81dce09e8dada7adb8b157da7323542d Mon Sep 17 00:00:00 2001 From: bcambl Date: Sun, 15 Jul 2018 13:28:58 -0600 Subject: [PATCH 2/2] add php-json to Fedora web deps Signed-off-by: bcambl --- automated install/basic-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index c6c83e74..58d3c531 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -244,7 +244,8 @@ elif command -v rpm &> /dev/null; then # If the host OS is Fedora, if grep -qi 'fedora' /etc/redhat-release; then # 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, elif grep -qi 'centos' /etc/redhat-release; then # Pi-Hole currently supports CentOS 7+ with PHP7+