Skip to content

Commit ef655e2

Browse files
committed
Remove duplicate ssh fail2ban jail
Fixes hestiacp#585
1 parent 9079222 commit ef655e2

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

install/hst-install-debian.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,6 +1614,9 @@ if [ "$fail2ban" = 'yes' ]; then
16141614
chmod 640 /var/log/auth.log
16151615
chown root:adm /var/log/auth.log
16161616
fi
1617+
if [ -f /etc/fail2ban/jail.d/defaults-debian.conf ]; then
1618+
rm -f /etc/fail2ban/jail.d/defaults-debian.conf
1619+
fi
16171620
update-rc.d fail2ban defaults
16181621
systemctl start fail2ban
16191622
check_result $? "fail2ban start failed"

install/hst-install-ubuntu.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,10 @@ if [ "$fail2ban" = 'yes' ]; then
15351535
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
15361536
sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local
15371537
fi
1538+
if [ -f /etc/fail2ban/jail.d/defaults-debian.conf ]; then
1539+
rm -f /etc/fail2ban/jail.d/defaults-debian.conf
1540+
fi
1541+
15381542
update-rc.d fail2ban defaults
15391543
systemctl start fail2ban >> $LOG
15401544
check_result $? "fail2ban start failed"

install/upgrade/versions/latest.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,12 @@ for user in $($HESTIA/bin/v-list-sys-users plain); do
9191
$HOMEDIR/$user/.composer \
9292
$HOMEDIR/$user/.ssh
9393
done
94+
95+
# Remove redundant fail2ban jail
96+
if fail2ban-client status sshd > /dev/null 2>&1 ; then
97+
fail2ban-client stop sshd
98+
if [ -f /etc/fail2ban/jail.d/defaults-debian.conf ]; then
99+
mkdir -p $HESTIA_BACKUP/conf/fail2ban/jail.d
100+
mv /etc/fail2ban/jail.d/defaults-debian.conf $HESTIA_BACKUP/conf/fail2ban/jail.d/
101+
fi
102+
fi

0 commit comments

Comments
 (0)