From 578a73dc67d040187b230d993607314ef3b8112b Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jul 28 2019 18:05:40 +0000 Subject: Fix LAMP test in CentOS8 --- diff --git a/tests/r_lamp/0_lamp_install.sh b/tests/r_lamp/0_lamp_install.sh index a8555cf..a1aedd8 100755 --- a/tests/r_lamp/0_lamp_install.sh +++ b/tests/r_lamp/0_lamp_install.sh @@ -9,6 +9,9 @@ t_Log "Running $0 - attempting to install LAMP stack." if [ $centos_ver = 5 ] then t_InstallPackage mysql-server mysql55-mysql-server httpd php +elif [ $centos_ver -ge 8 ] +then + t_InstallPackage mariadb-server httpd php else t_InstallPackage mysql-server httpd php fi diff --git a/tests/r_lamp/40_basic_lamp.sh b/tests/r_lamp/40_basic_lamp.sh index 62af80e..11a20a8 100755 --- a/tests/r_lamp/40_basic_lamp.sh +++ b/tests/r_lamp/40_basic_lamp.sh @@ -15,8 +15,11 @@ then elif [ $centos_ver = 6 ] then t_InstallPackage httpd mysql mysql-server php php-mysql wget -else +elif [ $centos_ver = 7 ] +then t_InstallPackage httpd mysql mysql-server php php-mysqlnd wget +else + t_InstallPackage httpd mariadb mariadb-server php php-mysqlnd wget fi t_ServiceControl mysqld restart t_ServiceControl httpd restart