Commit graph

390 commits

Author SHA1 Message Date
angus 25ac07cae7 Introduce the env variable ENABLE_FAIL2BAN.
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.
2016-04-06 19:29:39 +02:00
Thomas Willems d2bb97a810 check .pem existence and concat to combined.pem with added eol
Checks existince of cert, chain and privkey.pem.
Concats these files to combined.pem and adds a linebreak after each file
if there were none. This commit doesn't change the LE created .pem
files, so no unlinking on the host should happen (see
https://github.com/tomav/docker-mailserver/pull/111)
2016-04-05 11:53:20 +02:00
angus 0f94378842 All email-related services now logs in /var/log/mail/
and fail2ban config has been updated accordingly.
Added also a check before copying spamassassin rule file.
2016-04-01 17:18:13 +02:00
Thomas VIAL 5048f8b509 Merge pull request #114 from 00angus/feat_fail2ban_change
Add ENABLE_FAIL2BAN environment variable to enable fail2ban service
2016-04-01 12:46:53 +02:00
angus 5219aab9e8 Add ENABLE_FAIL2BAN environment variable to enable fail2ban service (it's not enabled by default, now).
* Changed/updated Makefile and integration tests
* Changed some grep expressions in the fail2ban tests
2016-03-31 12:33:47 +02:00
Thomas VIAL 735bbcae34 Merge pull request #111 from Reldeis/master
Add eol to letsencrypt provided files [Issue #110]
2016-03-31 10:48:05 +02:00
Reldeis 09315d3d3c Add eol to letsencrypt provided files 2016-03-30 11:51:40 +02:00
Thomas VIAL 8c6464d430 Merge pull request #108 from dominikbechstein/logrotate_fix
fixed log rotate
2016-03-26 10:13:18 +01:00
Dominik Bechstein b7355656bf Merge branch 'master' into logrotate_fix 2016-03-26 06:12:05 +01:00
Dominik Bechstein 8cc9df8bae Merge remote-tracking branch 'origin/logrotate_fix' 2016-03-26 06:04:21 +01:00
Thomas VIAL 55cfa30491 Merge pull request #104 from Chris54721/relay
Relay support & duplicate DKIM fix
2016-03-18 20:45:06 +01:00
Chris54721 53959b8eae Add tests for SASL_PASSWD 2016-03-18 20:12:18 +01:00
Chris54721 ec5837d496 Update start-mailserver.sh 2016-03-18 20:10:05 +01:00
Chris54721 3cabf10520 Add tests for main.cf overrides 2016-03-18 20:07:58 +01:00
Chris54721 19fed39dc4 Merge remote-tracking branch 'upstream/master' into relay 2016-03-18 20:00:48 +01:00
Dominik Winter 082577f27b continue to write the log information in the newly created file after rotating the old log file 2016-03-11 21:37:04 +01:00
Thomas VIAL dc796ea9f2 Merge pull request #92 from mjung/master
New SMTP_ONLY environment variable to disable all courier daemons
2016-03-01 09:18:50 +01:00
Marko J cbf72bdb53 Better documentation for SMTP_ONLY environment variable 2016-03-01 01:04:31 +00:00
Marko Jung ca35e0e313 on special request also some documentation 2016-03-01 00:21:23 +01:00
Marko Jung 2769269bd6 new SMTP_ONLY environment option to disable all courier daemons 2016-02-29 23:52:10 +01:00
Thomas VIAL 3c2bc6ccac Merge pull request #90 from emazzotta/patch-1
Allowing CA signed custom certificates
2016-02-27 20:11:47 +01:00
Emanuele Mazzotta 6bd5c5015a Allowing CA signed custom certificates
This is to use a non-letsencrypt but CA signed (so non-self-signed) certificate which contains everything, key etc.
2016-02-27 17:16:28 +01:00
Thomas VIAL ab9fd69052 Fixed test file now moved to "bats" 2016-02-25 12:15:33 +01:00
Thomas VIAL 67f3381808 Merge pull request #85 from tomav/move-test-framework-to-bats
Fixes #84 => Move test framework from assert.sh to bats
2016-02-25 09:42:09 +01:00
Thomas VIAL 890b70a133 Fixes 84 => moved to bats unit test framework 2016-02-25 00:17:01 +01:00
Thomas VIAL 22b79b82f8 Moved from assert.sh to bats 2016-02-25 00:11:48 +01:00
Thomas VIAL 91554372e5 Removed assert.sh and tests 2016-02-25 00:11:18 +01:00
Robert Dolca d36ecaa2c0 Add SASL_PASSWD environment variable to configure relay authentication 2016-02-20 02:21:25 +00:00
Robert Dolca 0e2ef0f8c2 Allow custom main.cf settings 2016-02-20 02:16:54 +00:00
Robert Dolca 2ff42baf41 Remove duplicate DKIM headers 2016-02-20 02:16:06 +00:00
Robert Dolca 0f1695cbb2 Set smtp_tls_security_level for smtp-amavis in master.cf
This way you can set smtp_tls_security_level = encrypt in
main.cf and amavis would still work.
2016-02-20 02:14:04 +00:00
Thomas VIAL 10d04efece Merge pull request #80 from tomav/fix-spamassassin-default-config
Added Spamassassin configuration using ENV variables (see README)
2016-02-18 23:16:06 +01:00
Thomas VIAL 8fee26080d Merge pull request #81 from espitall/master
Fix pop3 certificate path
2016-02-18 22:58:29 +01:00
Damien Espitallier 842d54e051 fix pop3 certificate path 2016-02-18 22:16:50 +01:00
Thomas VIAL 59a6649f0e Fixes #79 and add spamassassin configuration variables (see README.md) 2016-02-18 22:11:24 +01:00
Thomas VIAL 24e3b1286e Fixes #79 and spamassassin default configuration 2016-02-17 22:51:57 +01:00
Thomas VIAL f77e2e9ffa Added fail2ban to features list 2016-02-13 12:20:15 +01:00
Thomas VIAL 0e5de114b7 Merge pull request #78 from dominikwinter/fail2ban
Added fail2ban to prevent brute force attack.
2016-02-13 11:26:05 +01:00
Dominik Winter b54bce7b77 fixed timing problem for fail2ban test 2016-02-13 05:37:06 +01:00
Dominik Winter 5d157dceca added fail2ban tests 2016-02-13 04:43:57 +01:00
Dominik Winter 25b09928a3 add NET_ADMIN container capabilities instead of all privileges 2016-02-13 01:40:36 +01:00
Dominik Winter 7e7c34a256 added fail2ban 2016-02-12 00:19:21 +01:00
Thomas VIAL 52accb596c Merge pull request #77 from millaguie/master
Default imap folders
2016-02-11 19:10:25 +01:00
Javier Picado Ladrón de Guevara 7ce4b8c7d9 Update test.sh 2016-02-11 18:36:08 +01:00
Javier Picado Ladrón de Guevara aa2ae98b2a Default imap folders
Create default imap folders for Trash, Drafts and Sent.
2016-02-11 14:00:59 +01:00
Thomas VIAL dfd3a486d1 Moved SSL doc to the Wiki 2016-02-10 09:53:51 +01:00
Thomas VIAL 0f044ca6b5 Merge pull request #76 from tomav/fix-letsencrypt-combined
Removed whitespace
2016-02-09 13:23:24 +01:00
Thomas VIAL fc36bce383 Removed whitespace 2016-02-09 13:13:52 +01:00
Thomas VIAL f0a583fdba Merge pull request #75 from tomav/fix-letsencrypt-combined
Fixed combined.pem
2016-02-09 13:12:43 +01:00
Thomas VIAL 37d6871f1b Fixed combined.pem 2016-02-09 13:03:00 +01:00