github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Introduce the env variable ENABLE_FAIL2BAN.

Browse source 
Modified the Makefile so that the containers startup with a short delay
between each other.
Corrected a small bug in start-mailserver.sh that prevented the correct
configuration of the jails.
This commit is contained in:
angus 2016-04-06 19:29:39 +02:00
parent 0f94378842
commit 25ac07cae7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -21,18 +21,21 @@ run:
-e SA_KILL=3.0 \ -e SA_KILL=3.0 \
-e SASL_PASSWD=testing \ -e SASL_PASSWD=testing \
-h mail.my-domain.com -t $(NAME) -h mail.my-domain.com -t $(NAME)
sleep 15
docker run -d --name mail_pop3 \ docker run -d --name mail_pop3 \
-v "`pwd`/postfix":/tmp/postfix \ -v "`pwd`/postfix":/tmp/postfix \
-v "`pwd`/spamassassin":/tmp/spamassassin \ -v "`pwd`/spamassassin":/tmp/spamassassin \
-v "`pwd`/test":/tmp/test \ -v "`pwd`/test":/tmp/test \
-e ENABLE_POP3=1 \ -e ENABLE_POP3=1 \
-h mail.my-domain.com -t $(NAME) -h mail.my-domain.com -t $(NAME)
sleep 15
docker run -d --name mail_smtponly \ docker run -d --name mail_smtponly \
-v "`pwd`/postfix":/tmp/postfix \ -v "`pwd`/postfix":/tmp/postfix \
-v "`pwd`/spamassassin":/tmp/spamassassin \ -v "`pwd`/spamassassin":/tmp/spamassassin \
-v "`pwd`/test":/tmp/test \ -v "`pwd`/test":/tmp/test \
-e SMTP_ONLY=1 \ -e SMTP_ONLY=1 \
-h mail.my-domain.com -t $(NAME) -h mail.my-domain.com -t $(NAME)
sleep 15
docker run -d --name mail_fail2ban \ docker run -d --name mail_fail2ban \
-v "`pwd`/postfix":/tmp/postfix \ -v "`pwd`/postfix":/tmp/postfix \
-v "`pwd`/spamassassin":/tmp/spamassassin \ -v "`pwd`/spamassassin":/tmp/spamassassin \
@ -40,7 +43,7 @@ run:
-e ENABLE_FAIL2BAN=1 \ -e ENABLE_FAIL2BAN=1 \
-h mail.my-domain.com -t $(NAME) -h mail.my-domain.com -t $(NAME)
# Wait for containers to fully start # Wait for containers to fully start
sleep 60 sleep 15
fixtures: fixtures:
# Sending test mails # Sending test mails

2
start-mailserver.sh
View file

@ -240,7 +240,7 @@ awk 'BEGIN{unit=0}{if ($1=="[postfix]" || $1=="[couriersmtp]" || $1=="[courierau
else if ($1=="logpath" && unit==1) $3="/var/log/mail/mail.log"; else if ($1=="logpath" && unit==1) $3="/var/log/mail/mail.log";
print; print;
if (unit==1 && $1~/\[/ && $1!~/postfix|couriersmtp|courierauth|sasl/) unit=0; if (unit==1 && $1~/\[/ && $1!~/postfix|couriersmtp|courierauth|sasl/) unit=0;
}'/etc/fail2ban/jail.conf > /tmp/jail.conf.new && mv /tmp/jail.conf.new /etc/fail2ban/jail.conf && rm -f /tmp/jail.conf.new }' /etc/fail2ban/jail.conf > /tmp/jail.conf.new && mv /tmp/jail.conf.new /etc/fail2ban/jail.conf && rm -f /tmp/jail.conf.new
# increase ban time and find time to 3h # increase ban time and find time to 3h
sed -i "/^bantime *=/c\bantime = 10800" /etc/fail2ban/jail.conf sed -i "/^bantime *=/c\bantime = 10800" /etc/fail2ban/jail.conf