Commit graph

72 commits

Author SHA1 Message Date
angus a083292850 Merge pull request #118 from Reldeis/master
check .pem existence and concat to combined.pem with added eol.

Minor changes to command line that combine certs.
2016-04-09 00:27:33 +02:00
angus 09d5bb72e3 Configure fail2ban for dovecot and add custom failregex.
Correct the handling of virtual_alias_maps file in postfix (virtual)
for the generation of virtual_mailbox_domains file (vhost).
Minor changes to file names.
2016-04-08 16:48:52 +02:00
Thomas VIAL ae5052f210 Merge pull request #118 from Reldeis/master
check .pem existence and concat to combined.pem with added eol
2016-04-08 15:41:46 +02:00
angus 2e33fcaf42 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/
2016-04-08 00:42:31 +02:00
angus c2881024c7 Clamav, Imap, Pop3, Dovecot, Postfix services are now logging into
/var/log/mail directory.
Fail2ban jails and logrotate config files have been updated accordingly.
Integration tests have been extended to include a check of the new path.
2016-04-08 00:23:12 +02:00
angus ee0d0853dd Dovecot based version of the mailserver.
Courier and Cyrus Sasl have been removed and substituted with Dovecot which now
handle authentication for Postfix, Imap and Pop3, with support for SSL.
This allow the use of several encryption schemes for the password as well as a
single user db.
OpenDKIM keys can now be provided at the startup and will be used instead of
generating new ones (so that you don't have to change your DNS configuration).

This version builds correctly on Docker but no integration tests have been
reworked to accommodate Dovecot instead of Courier and Cyrus Sasl. As such
at present no automatic tests can be executed.
2016-04-07 14:42:07 +02:00
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
Reldeis 09315d3d3c Add eol to letsencrypt provided files 2016-03-30 11:51:40 +02:00
Dominik Bechstein 8cc9df8bae Merge remote-tracking branch 'origin/logrotate_fix' 2016-03-26 06:04:21 +01:00
Chris54721 ec5837d496 Update start-mailserver.sh 2016-03-18 20:10:05 +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
Marko Jung 2769269bd6 new SMTP_ONLY environment option to disable all courier daemons 2016-02-29 23:52:10 +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
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
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
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
Dominik Winter 7e7c34a256 added fail2ban 2016-02-12 00:19:21 +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 fc36bce383 Removed whitespace 2016-02-09 13:13:52 +01:00
Thomas VIAL 37d6871f1b Fixed combined.pem 2016-02-09 13:03:00 +01:00
bilak 9e81e1cae7 - fixed crash of opendmarc 2016-01-28 12:00:31 +01:00
bilak cc7270a22b - improved searching strings inside file (seraching for whole words) 2016-01-26 19:03:12 +01:00
bilak b73e602e3e - fixed equal sign 2016-01-26 18:53:57 +01:00
bilak 07ec823f45 - added DMARC (opendmarc) support with basic setup 2016-01-26 18:26:50 +01:00
Thomas VIAL 713fd8dc30 Merge branch 'pop3-support' of https://github.com/crash7/docker-mailserver into crash7-pop3-support 2016-01-26 12:56:26 +01:00
Christian Musa 9a80374bc3 Add pop3 support 2016-01-24 02:41:25 -03:00
bilak 426f87d916 - reworked dkim (configuring for all domains based on postfix/vhost) 2016-01-23 18:38:21 +01:00
bilak 5176ac03b5 - added DKIM support 2016-01-20 16:41:34 +01:00
Thomas VIAL f866359809 Merge pull request #50 from tomav/add-plain-and-login-mech
Add plain and login mech
2016-01-17 19:33:22 +01:00
Jonas Kalderstam a14f4879aa Remove redundant print 2016-01-16 00:54:51 +01:00
Jonas Kalderstam a6fbef9835 Do not create dir if it exists 2016-01-15 17:58:28 +01:00
Thomas VIAL f07a9ba852 Fix for #44 and #47, also enabling plain and login mechs. 2016-01-12 01:02:47 +01:00
Thomas VIAL b7e9221ffa Fixed error reported by jderusse 2015-12-05 19:08:39 +01:00
Thomas VIAL fe55350645 Cleaned code after live testing and improved documentation 2015-12-05 17:32:33 +01:00
Thomas VIAL e5719ceacb Begening configuration for Letsencrypt support 2015-12-05 16:44:13 +01:00
Thomas Butter 51bf5662de forward only domains should be added to vhosts 2015-10-14 16:50:57 +02:00
Thomas VIAL f18559f1c1 Fixed #18 => moved from fam to gamin and added a 'docker' user with id '5000' 2015-09-12 10:54:30 +02:00
Thomas VIAL 2578443f2c Fixed cacert.pem path for #14 2015-08-26 10:39:04 +02:00
Thomas VIAL c2c7ba70af Added a check on needed files with specific message - #17 2015-08-26 10:04:07 +02:00
Thomas VIAL 5b06f844ca Fixed cacert.pem path for #14 2015-08-19 18:05:10 +02:00
Thomas VIAL da3dbd4b10 Fixed cron that was not started - #16 2015-08-19 15:52:50 +02:00
Thomas VIAL c95dea76f6 Added better check on self-signed certs. for #14 2015-08-19 15:47:20 +02:00