arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-05 13:40:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2398 from pi-hole/rpm_distro_checks

Browse Source 
WIP: Update RPM distro checks
This commit is contained in:
Mark Drobnak 2018-08-31 12:54:55 -04:00 committed by GitHub
commit cf7180af5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
automated install/basic-install.sh
View File

@ -244,20 +244,20 @@ elif command -v rpm &> /dev/null; then
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"
LIGHTTPD_CFG="lighttpd.conf.fedora" LIGHTTPD_CFG="lighttpd.conf.fedora"
# If the host OS is Fedora, # If the host OS is Fedora,
if grep -qi 'fedora' /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
# ensure 'php-json' is installed on Fedora (installed as dependency on CentOS7 + Remi repository) # ensure 'php-json' is installed on Fedora (installed as dependency on CentOS7 + Remi repository)
PIHOLE_WEB_DEPS+=('php-json') 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 -qiE 'centos|scientific' /etc/redhat-release; then
# Pi-Hole currently supports CentOS 7+ with PHP7+ # Pi-Hole currently supports CentOS 7+ with PHP7+
SUPPORTED_CENTOS_VERSION=7 SUPPORTED_CENTOS_VERSION=7
SUPPORTED_CENTOS_PHP_VERSION=7 SUPPORTED_CENTOS_PHP_VERSION=7
# Check current CentOS major release version # Check current CentOS major release version
CURRENT_CENTOS_VERSION=$(rpm -q --queryformat '%{VERSION}' centos-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
echo -e " ${CROSS} CentOS $CURRENT_CENTOS_VERSION is not suported." echo -e " ${CROSS} CentOS $CURRENT_CENTOS_VERSION is not supported."
echo -e " Please update to CentOS release $SUPPORTED_CENTOS_VERSION or later" echo -e " Please update to CentOS release $SUPPORTED_CENTOS_VERSION or later"
# exit the installer # exit the installer
exit exit
@ -305,13 +305,16 @@ elif command -v rpm &> /dev/null; then
fi fi
fi fi
else else
# If not a supported version of Fedora or CentOS, # Warn user of unsupported version of Fedora or CentOS
echo -e " ${CROSS} Unsupported RPM based distribution" 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
# exit the installer echo -e " ${CROSS} Aborting installation due to unsupported RPM based distribution"
exit exit # exit the installer
else
echo -e " ${INFO} Continuing installation with unsupported RPM based distribution"
fi
fi fi
# If neither apt-get or rmp/dnf are found # If neither apt-get or yum/dnf package managers were found
else else
# it's not an OS we can support, # it's not an OS we can support,
echo -e " ${CROSS} OS distribution not supported" echo -e " ${CROSS} OS distribution not supported"

13
test/test_centos_fedora_support.py
View File

@ -31,20 +31,13 @@ def test_release_supported_version_check_centos(Pihole):
''' '''
confirms installer exits on unsupported releases of CentOS confirms installer exits on unsupported releases of CentOS
''' '''
# mock CentOS release < 7 (unsupported) # modify /etc/redhat-release to mock an unsupported CentOS release
mock_command_2( Pihole.run('echo "CentOS Linux release 6.9" > /etc/redhat-release')
'rpm',
{"-q --queryformat '%{VERSION}' centos-release'": (
'5',
'0'
)},
Pihole
)
distro_check = Pihole.run(''' distro_check = Pihole.run('''
source /opt/pihole/basic-install.sh source /opt/pihole/basic-install.sh
distro_check distro_check
''') ''')
expected_stdout = cross_box + (' CentOS is not suported.') expected_stdout = cross_box + (' CentOS 6 is not supported.')
assert expected_stdout in distro_check.stdout assert expected_stdout in distro_check.stdout
expected_stdout = 'Please update to CentOS release 7 or later' expected_stdout = 'Please update to CentOS release 7 or later'
assert expected_stdout in distro_check.stdout assert expected_stdout in distro_check.stdout