mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-21 05:44:07 -07:00
Merge 3b4405de84
into 873693b2ed
This commit is contained in:
commit
7079e1126d
1 changed files with 22 additions and 1 deletions
|
@ -621,6 +621,9 @@ if [ "$exim" = 'no' ]; then
|
||||||
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
|
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
|
||||||
software=$(echo "$software" | sed -e "s/clamav-daemon//")
|
software=$(echo "$software" | sed -e "s/clamav-daemon//")
|
||||||
software=$(echo "$software" | sed -e "s/spamassassin//")
|
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
|
fi
|
||||||
if [ "$clamd" = 'no' ]; then
|
if [ "$clamd" = 'no' ]; then
|
||||||
software=$(echo "$software" | sed -e "s/clamav-daemon//")
|
software=$(echo "$software" | sed -e "s/clamav-daemon//")
|
||||||
|
@ -639,7 +642,7 @@ if [ "$mysql" = 'no' ]; then
|
||||||
software=$(echo "$software" | sed -e 's/mysql-common//')
|
software=$(echo "$software" | sed -e 's/mysql-common//')
|
||||||
software=$(echo "$software" | sed -e 's/php5-mysql//')
|
software=$(echo "$software" | sed -e 's/php5-mysql//')
|
||||||
software=$(echo "$software" | sed -e 's/php-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
|
fi
|
||||||
if [ "$postgresql" = 'no' ]; then
|
if [ "$postgresql" = 'no' ]; then
|
||||||
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
|
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
|
||||||
|
@ -654,6 +657,24 @@ fi
|
||||||
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
|
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
|
||||||
software=$(echo "$software" | sed -e 's/fail2ban//')
|
software=$(echo "$software" | sed -e 's/fail2ban//')
|
||||||
fi
|
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
|
||||||
|
|
||||||
|
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue