|
|
@@ -809,9 +809,12 @@ if [ "$postgresql" = 'no' ]; then
|
|
|
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
|
|
|
software=$(echo "$software" | sed -e "s/phppgadmin//")
|
|
|
fi
|
|
|
-if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
|
|
|
+if [ "$fail2ban" = 'no' ]; then
|
|
|
software=$(echo "$software" | sed -e "s/fail2ban//")
|
|
|
+fi
|
|
|
+if [ "$iptables" = 'no' ]; then
|
|
|
software=$(echo "$software" | sed -e "s/ipset//")
|
|
|
+ software=$(echo "$software" | sed -e "s/fail2ban//")
|
|
|
fi
|
|
|
if [ "$phpfpm" = 'yes' ]; then
|
|
|
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
|