|
|
|
@ -911,7 +911,7 @@ if [ "$apache" = 'no' ]; then
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_ssl//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_ssl//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php.${arch}//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php//")
|
|
|
|
software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
|
|
|
|
software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
|
|
|
|
mod_php="disable"
|
|
|
|
mod_php="disable"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -956,11 +956,11 @@ if [ "$mysql8" = 'no' ]; then
|
|
|
|
software=$(echo "$software" | sed -e "s/mysql-common//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mysql-common//")
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if [ "$mysql" = 'no' ] && [ "$mysql8" = 'no' ]; then
|
|
|
|
if [ "$mysql" = 'no' ] && [ "$mysql8" = 'no' ]; then
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php-mysql.${arch}//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php-mysql//")
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if [ "$postgresql" = 'no' ]; then
|
|
|
|
if [ "$postgresql" = 'no' ]; then
|
|
|
|
software=$(echo "$software" | sed -e "s/postgresql-server//")
|
|
|
|
software=$(echo "$software" | sed -e "s/postgresql-server//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php-pgsql.${arch}//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php-pgsql//")
|
|
|
|
software=$(echo "$software" | sed -e "s/phppgadmin//")
|
|
|
|
software=$(echo "$software" | sed -e "s/phppgadmin//")
|
|
|
|
php_modules_install=$(echo "$php_modules_install" | sed -e "s/pgsql//")
|
|
|
|
php_modules_install=$(echo "$php_modules_install" | sed -e "s/pgsql//")
|
|
|
|
php_modules_install=$(echo "$php_modules_install" | sed -e "s/pdo_pgsql//")
|
|
|
|
php_modules_install=$(echo "$php_modules_install" | sed -e "s/pdo_pgsql//")
|
|
|
|
@ -974,12 +974,12 @@ if [ "$iptables" = 'no' ]; then
|
|
|
|
software=$(echo "$software" | sed -e "s/fail2ban//")
|
|
|
|
software=$(echo "$software" | sed -e "s/fail2ban//")
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if [ "$phpfpm" = 'yes' ]; then
|
|
|
|
if [ "$phpfpm" = 'yes' ]; then
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php-cgi.${arch}//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php-cgi//")
|
|
|
|
software=$(echo "$software" | sed -e "s/httpd-itk//")
|
|
|
|
software=$(echo "$software" | sed -e "s/httpd-itk//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_ruid2 //")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_ruid2 //")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
|
|
|
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php.${arch}//")
|
|
|
|
software=$(echo "$software" | sed -e "s/php${php_v}-php//")
|
|
|
|
software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
|
|
|
|
software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
|
|
|
|
mod_php="disable"
|
|
|
|
mod_php="disable"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -1478,7 +1478,9 @@ if [ "$apache" = 'yes' ]; then
|
|
|
|
if [ -e /etc/httpd/conf.dmod_suphp.conf ]; then
|
|
|
|
if [ -e /etc/httpd/conf.dmod_suphp.conf ]; then
|
|
|
|
cp /etc/httpd/conf.d/mod_suphp.conf /etc/httpd/conf.h.d/mod_suphp.conf
|
|
|
|
cp /etc/httpd/conf.d/mod_suphp.conf /etc/httpd/conf.h.d/mod_suphp.conf
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
ln -s "/etc/httpd/conf.d.prep/php${php_v}.conf" /etc/httpd/conf.modules.d/09-mod-php.conf
|
|
|
|
if [ -e "/etc/httpd/conf.d.prep/php${php_v}.conf" ]; then
|
|
|
|
|
|
|
|
ln -s "/etc/httpd/conf.d.prep/php${php_v}.conf" /etc/httpd/conf.modules.d/09-mod-php.conf
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|