From 45495627109171cd83bcd35b5728caf4e50343e6 Mon Sep 17 00:00:00 2001
From: kaibae19 <99116238+kaibae19@users.noreply.github.com>
Date: Mon, 4 Apr 2022 08:09:18 -0700
Subject: [PATCH] Update system.sh
---
setup/system.sh | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/setup/system.sh b/setup/system.sh
index 3bb5c7c9..f25b16ce 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -372,22 +372,27 @@ else
service restart bind9
fi
+
# ### Fail2Ban Service
+# We'll skip this on docker installations
-# Configure the Fail2Ban installation to prevent dumb bruce-force attacks against dovecot, postfix, ssh, etc.
-rm -f /etc/fail2ban/jail.local # we used to use this file but don't anymore
-rm -f /etc/fail2ban/jail.d/defaults-debian.conf # removes default config so we can manage all of fail2ban rules in one config
-cat conf/fail2ban/jails.conf \
- | sed "s/PUBLIC_IP/$PUBLIC_IP/g" \
- | sed "s#STORAGE_ROOT#$STORAGE_ROOT#" \
- > /etc/fail2ban/jail.d/mailinabox.conf
-cp -f conf/fail2ban/filter.d/* /etc/fail2ban/filter.d/
+if [ "$INSTALL" == "m" ]; then
+ # Configure the Fail2Ban installation to prevent dumb bruce-force attacks against dovecot, postfix, ssh, etc.
+ rm -f /etc/fail2ban/jail.local # we used to use this file but don't anymore
+ rm -f /etc/fail2ban/jail.d/defaults-debian.conf # removes default config so we can manage all of fail2ban rules in one config
+ cat conf/fail2ban/jails.conf \
+ | sed "s/PUBLIC_IP/$PUBLIC_IP/g" \
+ | sed "s#STORAGE_ROOT#$STORAGE_ROOT#" \
+ > /etc/fail2ban/jail.d/mailinabox.conf
+ cp -f conf/fail2ban/filter.d/* /etc/fail2ban/filter.d/
-# On first installation, the log files that the jails look at don't all exist.
-# e.g., The roundcube error log isn't normally created until someone logs into
-# Roundcube for the first time. This causes fail2ban to fail to start. Later
-# scripts will ensure the files exist and then fail2ban is given another
-# restart at the very end of setup.
-restart_service fail2ban
+
+ # On first installation, the log files that the jails look at don't all exist.
+ # e.g., The roundcube error log isn't normally created until someone logs into
+ # Roundcube for the first time. This causes fail2ban to fail to start. Later
+ # scripts will ensure the files exist and then fail2ban is given another
+ # restart at the very end of setup.
+ restart_service fail2ban
+fi
echo "Finsihed system.sh"