Merge branch 'v2' of github.com:tomav/docker-mailserver into v2

This commit is contained in:
Thomas VIAL 2016-04-20 23:02:23 +02:00
commit a2109ff287

View file

@ -232,6 +232,8 @@ test -e /tmp/docker-mailserver/spamassassin-rules.cf && cp /tmp/docker-mailserve
# Disable logrotate config for fail2ban if not enabled # Disable logrotate config for fail2ban if not enabled
test -z "$ENABLE_FAIL2BAN"&& rm -f /etc/logrotate.d/fail2ban test -z "$ENABLE_FAIL2BAN"&& rm -f /etc/logrotate.d/fail2ban
# Fix cron.daily for spamassassin
sed -i -e 's/invoke-rc.d spamassassin reload/\/etc\/init\.d\/spamassassin reload/g' /etc/cron.daily/spamassassin
echo "Starting daemons" echo "Starting daemons"
cron cron