Skip to content

Commit b049188

Browse files
authored
Install ipset if iptables is enabled, regardless of fail2ban. (hestiacp#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
1 parent f7f332c commit b049188

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

install/hst-install-debian.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,12 @@ if [ "$postgresql" = 'no' ]; then
809809
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
810810
software=$(echo "$software" | sed -e "s/phppgadmin//")
811811
fi
812-
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
812+
if [ "$fail2ban" = 'no' ]; then
813813
software=$(echo "$software" | sed -e "s/fail2ban//")
814+
fi
815+
if [ "$iptables" = 'no' ]; then
814816
software=$(echo "$software" | sed -e "s/ipset//")
817+
software=$(echo "$software" | sed -e "s/fail2ban//")
815818
fi
816819
if [ "$phpfpm" = 'yes' ]; then
817820
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")

install/hst-install-ubuntu.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,9 +784,12 @@ if [ "$postgresql" = 'no' ]; then
784784
fi
785785
software=$(echo "$software" | sed -e "s/phppgadmin//")
786786
fi
787-
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
787+
if [ "$fail2ban" = 'no' ]; then
788788
software=$(echo "$software" | sed -e "s/fail2ban//")
789+
fi
790+
if [ "$iptables" = 'no' ]; then
789791
software=$(echo "$software" | sed -e "s/ipset//")
792+
software=$(echo "$software" | sed -e "s/fail2ban//")
790793
fi
791794
if [ "$phpfpm" = 'yes' ]; then
792795
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")

0 commit comments

Comments
 (0)