Merge pull request #4775 from pi-hole/fix/centos_epel

Directly download CentOS 7 epel-release

automated install/basic-install.sh

@@ -397,13 +397,15 @@ select_rpm_php(){
             unset CENTOS7_PIHOLE_WEB_DEPS
         fi
         # CentOS requires the EPEL repository to gain access to Fedora packages
-        EPEL_PKG="epel-release"
-        rpm -q ${EPEL_PKG} &> /dev/null || rc=$?
-        if [[ $rc -ne 0 ]]; then
+        if [[ CURRENT_CENTOS_VERSION -eq 7 ]]; then
+            EPEL_PKG="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+        elif [[ CURRENT_CENTOS_VERSION -eq 8 ]]; then
+            EPEL_PKG="https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"
+        fi
+
         printf "  %b Enabling EPEL package repository (https://fedoraproject.org/wiki/EPEL)\\n" "${INFO}"
         "${PKG_INSTALL[@]}" ${EPEL_PKG} &> /dev/null
         printf "  %b Installed %s\\n" "${TICK}" "${EPEL_PKG}"
-        fi
 
         # The default php on CentOS 7.x is 5.4 which is EOL
         # Check if the version of PHP available via installed repositories is >= to PHP 7

test/test_centos_common_support.py

@@ -36,7 +36,7 @@ def test_enable_epel_repository_centos(host):
     expected_stdout = info_box + (' Enabling EPEL package repository '
                                   '(https://fedoraproject.org/wiki/EPEL)')
     assert expected_stdout in package_manager_detect.stdout
-    expected_stdout = tick_box + ' Installed epel-release'
+    expected_stdout = tick_box + ' Installed'
     assert expected_stdout in package_manager_detect.stdout
     epel_package = host.package('epel-release')
     assert epel_package.is_installed