mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 23:08:07 +00:00
Remove special Centos7 hand holds. Move the unsupported dialog out to a further if block so that a user may still continue to install on centos7 (provided they have the pre-requisites installed)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
parent
e29aa4e205
commit
9c03915cb0
@ -376,37 +376,19 @@ package_manager_detect() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
select_rpm_php(){
|
select_rpm_php(){
|
||||||
|
local unsupported_dialog=0
|
||||||
# If the host OS is Fedora,
|
# If the host OS is Fedora,
|
||||||
if grep -qiE 'fedora|fedberry' /etc/redhat-release; then
|
if grep -qiE 'fedora|fedberry' /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
|
: # continue
|
||||||
# or if host OS is CentOS,
|
# or if host OS is CentOS,
|
||||||
elif grep -qiE 'centos|scientific|alma|rocky' /etc/redhat-release; then
|
elif grep -qiE 'centos|scientific|alma|rocky' /etc/redhat-release; then
|
||||||
# Pi-Hole currently supports CentOS 7+ with PHP7+
|
SUPPORTED_CENTOS_VERSION=8
|
||||||
SUPPORTED_CENTOS_VERSION=7
|
|
||||||
SUPPORTED_CENTOS_PHP_VERSION=7
|
|
||||||
# Check current CentOS major release version
|
# Check current CentOS major release version
|
||||||
CURRENT_CENTOS_VERSION=$(grep -oP '(?<= )[0-9]+(?=\.?)' /etc/redhat-release)
|
CURRENT_CENTOS_VERSION=$(grep -oP '(?<= )[0-9]+(?=\.?)' /etc/redhat-release)
|
||||||
# Check if CentOS version is supported
|
# Check if CentOS version is supported
|
||||||
if [[ $CURRENT_CENTOS_VERSION -lt $SUPPORTED_CENTOS_VERSION ]]; then
|
if [[ $CURRENT_CENTOS_VERSION -lt $SUPPORTED_CENTOS_VERSION ]]; then
|
||||||
printf " %b CentOS %s is not supported.\\n" "${CROSS}" "${CURRENT_CENTOS_VERSION}"
|
unsupported_dialog=1
|
||||||
printf " Please update to CentOS release %s or later.\\n" "${SUPPORTED_CENTOS_VERSION}"
|
|
||||||
# exit the installer
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
# php-json is not required on CentOS 7 as it is already compiled into php
|
|
||||||
# verify via `php -m | grep json`
|
|
||||||
if [[ $CURRENT_CENTOS_VERSION -eq 7 ]]; then
|
|
||||||
# create a temporary array as arrays are not designed for use as mutable data structures
|
|
||||||
CENTOS7_PIHOLE_WEB_DEPS=()
|
|
||||||
for i in "${!PIHOLE_WEB_DEPS[@]}"; do
|
|
||||||
if [[ ${PIHOLE_WEB_DEPS[i]} != "php-json" ]]; then
|
|
||||||
CENTOS7_PIHOLE_WEB_DEPS+=( "${PIHOLE_WEB_DEPS[i]}" )
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# re-assign the clean dependency array back to PIHOLE_WEB_DEPS
|
|
||||||
PIHOLE_WEB_DEPS=("${CENTOS7_PIHOLE_WEB_DEPS[@]}")
|
|
||||||
unset CENTOS7_PIHOLE_WEB_DEPS
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if rpm -qa | grep -qi 'epel'; then
|
if rpm -qa | grep -qi 'epel'; then
|
||||||
@ -418,68 +400,11 @@ select_rpm_php(){
|
|||||||
"${PKG_INSTALL[@]}" ${EPEL_PKG}
|
"${PKG_INSTALL[@]}" ${EPEL_PKG}
|
||||||
printf " %b Installed %s\\n" "${TICK}" "${EPEL_PKG}"
|
printf " %b Installed %s\\n" "${TICK}" "${EPEL_PKG}"
|
||||||
fi
|
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
|
|
||||||
AVAILABLE_PHP_VERSION=$("${PKG_MANAGER}" info php | grep -i version | grep -o '[0-9]\+' | head -1)
|
|
||||||
if [[ $AVAILABLE_PHP_VERSION -ge $SUPPORTED_CENTOS_PHP_VERSION ]]; then
|
|
||||||
# Since PHP 7 is available by default, install via default PHP package names
|
|
||||||
: # do nothing as PHP is current
|
|
||||||
printf "PHP 7 is installed"
|
|
||||||
else
|
|
||||||
REMI_PKG="remi-release"
|
|
||||||
REMI_REPO="remi-php72"
|
|
||||||
REMI_REPO_URL="https://rpms.remirepo.net/enterprise/${REMI_PKG}-$(rpm -E '%{rhel}').rpm"
|
|
||||||
|
|
||||||
# The PHP version available via default repositories is older than version 7
|
|
||||||
dialog --no-shadow --keep-tite \
|
|
||||||
--title "PHP 7 Update (recommended)" \
|
|
||||||
--defaultno \
|
|
||||||
--yesno "PHP 7.x is recommended for both security and language features.\
|
|
||||||
\\n\\nWould you like to install PHP7 via Remi's RPM repository?\
|
|
||||||
\\n\\nSee: https://rpms.remirepo.net for more information"\
|
|
||||||
"${r}" "${c}" && result=0 || result=$?
|
|
||||||
|
|
||||||
case ${result} in
|
|
||||||
"${DIALOG_OK}" )
|
|
||||||
printf " %b Installing PHP 7 via Remi's RPM repository\\n" "${INFO}"
|
|
||||||
"${PKG_INSTALL[@]}" "yum-utils" &> /dev/null
|
|
||||||
if rpm -q ${REMI_PKG} &> /dev/null; then
|
|
||||||
printf " %b Remi's RPM repository is already installed\\n" "${TICK}"
|
|
||||||
else
|
|
||||||
printf " %b Enabling Remi's RPM repository (https://rpms.remirepo.net)\\n" "${INFO}"
|
|
||||||
yum -y install "${REMI_REPO_URL}"
|
|
||||||
printf " %b Installed %s from %s\\n" "${TICK}" "${REMI_PKG}" "${REMI_REPO_URL}"
|
|
||||||
printf " %b Remi's RPM repository has been enabled for PHP7\\n" "${TICK}"
|
|
||||||
fi
|
|
||||||
yum-config-manager --disable 'remi-php*'
|
|
||||||
yum-config-manager --enable "${REMI_REPO}"
|
|
||||||
|
|
||||||
# trigger an install/update of PHP to ensure previous version of PHP is updated from REMI
|
|
||||||
if "${PKG_INSTALL[@]}" "php-cli" &> /dev/null; then
|
|
||||||
printf " %b PHP7 installed/updated via Remi's RPM repository\\n" "${TICK}"
|
|
||||||
else
|
|
||||||
printf " %b There was a problem updating to PHP7 via Remi's RPM repository\\n" "${CROSS}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
# User chose not to install PHP 7 via Remi's RPM repository
|
|
||||||
"${DIALOG_CANCEL}")
|
|
||||||
# User decided to NOT update PHP from REMI, attempt to install the default available PHP version
|
|
||||||
printf " %b User opt-out of PHP 7 upgrade on CentOS. Deprecated PHP may be in use.\\n" "${INFO}"
|
|
||||||
;;
|
|
||||||
|
|
||||||
# User closed the dialog window
|
|
||||||
"${DIALOG_ESC}")
|
|
||||||
printf " %b Escape pressed, exiting installer at Remi dialog window\\n" "${CROSS}"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
else
|
||||||
|
unsupported_dialog=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${unsupported_dialog} -eq 1 ]];then
|
||||||
# Warn user of unsupported version of Fedora or CentOS
|
# Warn user of unsupported version of Fedora or CentOS
|
||||||
dialog --no-shadow --keep-tite \
|
dialog --no-shadow --keep-tite \
|
||||||
--title "Unsupported RPM based distribution" \
|
--title "Unsupported RPM based distribution" \
|
||||||
|
|||||||
@ -7,23 +7,6 @@ from .conftest import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_release_supported_version_check_centos(host):
|
|
||||||
'''
|
|
||||||
confirms installer exits on unsupported releases of CentOS
|
|
||||||
'''
|
|
||||||
# modify /etc/redhat-release to mock an unsupported CentOS release
|
|
||||||
host.run('echo "CentOS Linux release 6.9" > /etc/redhat-release')
|
|
||||||
package_manager_detect = host.run('''
|
|
||||||
source /opt/pihole/basic-install.sh
|
|
||||||
package_manager_detect
|
|
||||||
select_rpm_php
|
|
||||||
''')
|
|
||||||
expected_stdout = cross_box + (' CentOS 6 is not supported.')
|
|
||||||
assert expected_stdout in package_manager_detect.stdout
|
|
||||||
expected_stdout = 'Please update to CentOS release 7 or later'
|
|
||||||
assert expected_stdout in package_manager_detect.stdout
|
|
||||||
|
|
||||||
|
|
||||||
def test_enable_epel_repository_centos(host):
|
def test_enable_epel_repository_centos(host):
|
||||||
'''
|
'''
|
||||||
confirms the EPEL package repository is enabled when installed on CentOS
|
confirms the EPEL package repository is enabled when installed on CentOS
|
||||||
@ -40,86 +23,3 @@ def test_enable_epel_repository_centos(host):
|
|||||||
assert expected_stdout in package_manager_detect.stdout
|
assert expected_stdout in package_manager_detect.stdout
|
||||||
epel_package = host.package('epel-release')
|
epel_package = host.package('epel-release')
|
||||||
assert epel_package.is_installed
|
assert epel_package.is_installed
|
||||||
|
|
||||||
|
|
||||||
def test_php_version_lt_7_detected_upgrade_default_optout_centos(host):
|
|
||||||
'''
|
|
||||||
confirms the default behavior to opt-out of upgrading to PHP7 from REMI
|
|
||||||
'''
|
|
||||||
# first we will install the default php version to test installer behavior
|
|
||||||
php_install = host.run('yum install -y php')
|
|
||||||
assert php_install.rc == 0
|
|
||||||
php_package = host.package('php')
|
|
||||||
default_centos_php_version = php_package.version.split('.')[0]
|
|
||||||
if int(default_centos_php_version) >= 7: # PHP7 is supported/recommended
|
|
||||||
pytest.skip("Test deprecated . Detected default PHP version >= 7")
|
|
||||||
package_manager_detect = host.run('''
|
|
||||||
source /opt/pihole/basic-install.sh
|
|
||||||
package_manager_detect
|
|
||||||
select_rpm_php
|
|
||||||
''')
|
|
||||||
expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
|
|
||||||
'Deprecated PHP may be in use.')
|
|
||||||
assert expected_stdout in package_manager_detect.stdout
|
|
||||||
remi_package = host.package('remi-release')
|
|
||||||
assert not remi_package.is_installed
|
|
||||||
|
|
||||||
|
|
||||||
def test_php_version_lt_7_detected_upgrade_user_optout_centos(host):
|
|
||||||
'''
|
|
||||||
confirms installer behavior when user opt-out to upgrade to PHP7 via REMI
|
|
||||||
'''
|
|
||||||
# first we will install the default php version to test installer behavior
|
|
||||||
php_install = host.run('yum install -y php')
|
|
||||||
assert php_install.rc == 0
|
|
||||||
php_package = host.package('php')
|
|
||||||
default_centos_php_version = php_package.version.split('.')[0]
|
|
||||||
if int(default_centos_php_version) >= 7: # PHP7 is supported/recommended
|
|
||||||
pytest.skip("Test deprecated . Detected default PHP version >= 7")
|
|
||||||
# dialog returns Cancel for user prompt
|
|
||||||
mock_command('dialog', {'*': ('', '1')}, host)
|
|
||||||
package_manager_detect = host.run('''
|
|
||||||
source /opt/pihole/basic-install.sh
|
|
||||||
package_manager_detect
|
|
||||||
select_rpm_php
|
|
||||||
''')
|
|
||||||
expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
|
|
||||||
'Deprecated PHP may be in use.')
|
|
||||||
assert expected_stdout in package_manager_detect.stdout
|
|
||||||
remi_package = host.package('remi-release')
|
|
||||||
assert not remi_package.is_installed
|
|
||||||
|
|
||||||
|
|
||||||
def test_php_version_lt_7_detected_upgrade_user_optin_centos(host):
|
|
||||||
'''
|
|
||||||
confirms installer behavior when user opt-in to upgrade to PHP7 via REMI
|
|
||||||
'''
|
|
||||||
# first we will install the default php version to test installer behavior
|
|
||||||
php_install = host.run('yum install -y php')
|
|
||||||
assert php_install.rc == 0
|
|
||||||
php_package = host.package('php')
|
|
||||||
default_centos_php_version = php_package.version.split('.')[0]
|
|
||||||
if int(default_centos_php_version) >= 7: # PHP7 is supported/recommended
|
|
||||||
pytest.skip("Test deprecated . Detected default PHP version >= 7")
|
|
||||||
# dialog returns Continue for user prompt
|
|
||||||
mock_command('dialog', {'*': ('', '0')}, host)
|
|
||||||
package_manager_detect = host.run('''
|
|
||||||
source /opt/pihole/basic-install.sh
|
|
||||||
package_manager_detect
|
|
||||||
select_rpm_php
|
|
||||||
install_dependent_packages PIHOLE_WEB_DEPS[@]
|
|
||||||
''')
|
|
||||||
expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
|
|
||||||
'Deprecated PHP may be in use.')
|
|
||||||
assert expected_stdout not in package_manager_detect.stdout
|
|
||||||
expected_stdout = info_box + (' Enabling Remi\'s RPM repository '
|
|
||||||
'(https://rpms.remirepo.net)')
|
|
||||||
assert expected_stdout in package_manager_detect.stdout
|
|
||||||
expected_stdout = tick_box + (' Remi\'s RPM repository has '
|
|
||||||
'been enabled for PHP7')
|
|
||||||
assert expected_stdout in package_manager_detect.stdout
|
|
||||||
remi_package = host.package('remi-release')
|
|
||||||
assert remi_package.is_installed
|
|
||||||
updated_php_package = host.package('php')
|
|
||||||
updated_php_version = updated_php_package.version.split('.')[0]
|
|
||||||
assert int(updated_php_version) == 7
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user