Просмотр исходного кода

Install ipset if iptables is enabled, regardless of fail2ban. (#874)

* Update hst-install-debian.sh

Install ipset if iptables is enabled, regardless of fail2ban.

* Update hst-install-ubuntu.sh

Install ipset if iptables is enabled, regardless of fail2ban.

* Update hst-install-debian.sh

* Update hst-install-ubuntu.sh
kpapad904 5 лет назад
Родитель
Сommit
b04918885d
2 измененных файлов с 8 добавлено и 2 удалено
  1. 4 1
      install/hst-install-debian.sh
  2. 4 1
      install/hst-install-ubuntu.sh

+ 4 - 1
install/hst-install-debian.sh

@@ -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//")

+ 4 - 1
install/hst-install-ubuntu.sh

@@ -784,9 +784,12 @@ if [ "$postgresql" = 'no' ]; then
     fi
     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//")