Merge branch 'feat_separate-logs' into feat_dovecot_separate-logs

* Dovecot has been added in place of courier and cyrus sasl
* Email services now logs to /var/log/mail/
This commit is contained in:
angus 2016-04-08 00:42:31 +02:00
commit 2e33fcaf42
3 changed files with 44 additions and 19 deletions

View file

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