From 3b4405de84c1cea33aa335774bdd57aa7614e1c1 Mon Sep 17 00:00:00 2001 From: Maksim Usmanov | Maks Date: Tue, 28 Jan 2020 22:07:53 +0100 Subject: [PATCH] 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 --- install/vst-install-debian.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index ad9599e3ff..053e5aee01 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -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 #----------------------------------------------------------#