Fix Exclustion of phpmyadmin, php and roundcube

PHPMYADMIN need two exclustions in debian 9 and 10 was defined diferent

If we not have apache instaled and not select php-fpm to use nginx + php-fpm we cant use phpmyadmin, php, roundcube, awstats and webanalizer so remove all

This will fix #1965 I need check ubuntu installer and see if have similar problem
This commit is contained in:
Maksim Usmanov | Maks 2020-01-28 22:07:53 +01:00 committed by GitHub
commit 3b4405de84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -601,6 +601,9 @@ if [ "$exim" = 'no' ]; then
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
software=$(echo "$software" | sed -e "s/clamav-daemon//")
software=$(echo "$software" | sed -e "s/spamassassin//")
software=$(echo "$software" | sed -e 's/roundcube-core//')
software=$(echo "$software" | sed -e 's/roundcube-mysql//')
software=$(echo "$software" | sed -e 's/roundcube-plugins//')
fi
if [ "$clamd" = 'no' ]; then
software=$(echo "$software" | sed -e "s/clamav-daemon//")
@ -619,7 +622,7 @@ if [ "$mysql" = 'no' ]; then
software=$(echo "$software" | sed -e 's/mysql-common//')
software=$(echo "$software" | sed -e 's/php5-mysql//')
software=$(echo "$software" | sed -e 's/php-mysql//')
software=$(echo "$software" | sed -e 's/phpMyAdmin//')
software=$(echo "$software" | sed -e 's/php[Mm]y[Aa]dmin//')
fi
if [ "$postgresql" = 'no' ]; then
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
@ -634,6 +637,24 @@ fi
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
software=$(echo "$software" | sed -e 's/fail2ban//')
fi
if [ "$apache" = 'no' ] && [ "$phpfpm" = 'no' ]; then
software=$(echo "$software" | sed -e 's/php5 //')
software=$(echo "$software" | sed -e 's/php //')
software=$(echo "$software" | sed -e 's/php-common//')
software=$(echo "$software" | sed -e 's/php5-common//')
software=$(echo "$software" | sed -e 's/php-cgi//')
software=$(echo "$software" | sed -e 's/php5-cgi//')
software=$(echo "$software" | sed -e 's/php5-curl//')
software=$(echo "$software" | sed -e 's/php-curl//')
software=$(echo "$software" | sed -e 's/php5-mysql//')
software=$(echo "$software" | sed -e 's/php-mysql//')
software=$(echo "$software" | sed -e 's/php[Mm]y[Aa]dmin//')
software=$(echo "$software" | sed -e 's/roundcube-core//')
software=$(echo "$software" | sed -e 's/roundcube-mysql//')
software=$(echo "$software" | sed -e 's/roundcube-plugins//')
software=$(echo "$software" | sed -e 's/awstats//')
software=$(echo "$software" | sed -e 's/webalizer//')
fi
#----------------------------------------------------------#