Commit Graph

219 Commits

Author SHA1 Message Date
Sascha Spreitzer 82f869898a Merge a6097dbef4 into a856eee0c4 2016-04-26 06:42:06 +00:00
Thomas VIAL a856eee0c4
Added information regarding future v2 version 2016-04-24 21:37:17 +02:00
Thomas VIAL cc17c20cef Merge pull request #158 from stonemaster/patch-1
Fix link to SSL Wiki documentation.
2016-04-24 18:02:55 +02:00
André Stein da831754e8 Fix link to SSL Wiki documentation. 2016-04-24 17:26:12 +02:00
Thomas VIAL 0cf0cb58c6 Merge pull request #147 from auguster/master
Dockerfile optimization to reduce image size
2016-04-21 13:27:49 +02:00
Rémi Auguste 3c4f000b53 Dockerfile optimization to reduce image size 2016-04-21 12:56:25 +02:00
Thomas VIAL 43925aa44c Merge pull request #145 from 00angus/master_rename-main
Changed the name of the postfix config we load at runtime
2016-04-21 12:23:15 +02:00
angus b9becc08d6 Changed the name of the postfix config we load at runtime, from
main.cf to runtime.main.cf.
That should clarify the use of that file, i.e. for runtime changes
to postfix config.
2016-04-21 00:20:03 +02:00
Thomas VIAL c278a4a46a Merge pull request #140 from auguster/master
/etc/opendkim/TrustedHosts creation if missing
2016-04-19 23:24:05 +02:00
Rémi AUGUSTE c401458034 Automatic file `/etc/opendkim/TrustedHosts` creation if missing
Following issue #132, the script `start-mailserver.sh` now creates and populates `/etc/opendkim/TrustedHosts` with localhost information.
This allow for mounting an empty directory from the host for DKIM data persistence.
2016-04-19 22:40:40 +02:00
Rémi Auguste b10e219ae4 Merge pull request #1 from tomav/master
sync repos
2016-04-19 18:48:38 +02:00
Thomas VIAL 633a0ffeb3 Merge pull request #135 from 00angus/feat_userdbs-update
Fixes #96 regarding password security. no more clear password can be provided.
2016-04-19 18:30:40 +02:00
angus cfdefb624f Added test case in tests.bats: container shouldn't start up when an
account.cf is present.
2016-04-19 11:50:49 +02:00
angus c8eaf655ca Allow to provide pre-configured user databases, with encrypted passwords already setup.
For security reason accounts.cf file must not be provided anymore to the container or
it will stop with an error message! User configuration is only allowed via pre-configured
user databases. See README.md for instructions.
This changes also the way we setup users for CI tests: the right databases have been
added and Makefile has been modified accordingly.
2016-04-16 16:56:26 +02:00
angus 8e639d2a46 Allow to provide pre-configured user databases, with encrypted passwords already setup.
The startup logic for user configuration is now as follows:
 * /tmp/postfix/accounts-db/{userdb,sasldb2} available: DBs copied to the image,
   users setup completed;
 * /tmp/postfix/accounts.cf available: users are setup from that file;
 * otherwise no mail account will be setup.
Changes:
- Dockerfile: added script to generate-user-databases
- generate-user-databases: script can be called to generate DBs
  from account.cf file and export them to the host
- start-mailserver.sh: implemented logic for managing users provided
  in account.cf files or in user databases
2016-04-16 15:27:32 +02:00
Sascha Spreitzer a6097dbef4 Disable cleartext authentication on SMTP 2016-04-14 08:00:26 +00:00
Thomas VIAL 6b3360dd7c Merge pull request #131 from auguster/master
Removed IFS + Added vmailbox config - Fixes #121
2016-04-11 22:43:38 +02:00
Thomas VIAL c899831cb9 Merge pull request #129 from 00angus/master
Fixes #125 bug when combining certs for Letsencrypt.
2016-04-11 19:02:00 +02:00
Rémi Auguste 5f9e0acd9d Added custom vmailbox configuration
the content of /tmp/postfix/vmailbox is appended to the generated /etc/postfix/vmailbox
2016-04-11 18:25:45 +02:00
Rémi Auguste eb52dc66f9 Removed IFS on virtual file parsing
After issue #121, I removed the IFS on space to make the parsing of virtual more robust
2016-04-11 18:21:12 +02:00
angus 7fa0f72e2b Fix bug when combining certs for Letsencrypt. 2016-04-11 16:12:07 +02:00
Thomas VIAL 996af0e15f Merge pull request #122 from aforty/master
Fixed var name $SASL_PASSWD to $SASL_PASSWORD
2016-04-11 14:00:36 +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
Thomas VIAL 6d8864eb99 Merge pull request #116 from 00angus/feat_separate-logs
All email-related services now logs in /var/log/mail/
2016-04-08 10:07:02 +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
Arno Fortelny 8bc209aeb9 Merge pull request #2 from aforty/patch-2
Changed $SASL_PASSWD to $SASL_PASSWORD
2016-04-07 15:07:49 -04:00
Arno Fortelny 06fc49a538 Merge pull request #1 from aforty/patch-1
Changed $SASL_PASSWD to $SASL_PASSWORD
2016-04-07 15:07:28 -04:00
Arno Fortelny 44fd4b26f6 Update Makefile
Updated `SASL_PASSWD` to `SASL_PASSWORD` to be consistent with documentation.
2016-04-07 15:05:36 -04:00
Arno Fortelny d8404a3767 Updated $SASL_PASSWD => $SASL_PASSWORD
The README lists the environmental variable as `SASL_PASSWORD` while the startup script was actually looking for `SASL_PASSWD`. The script now looks for `SASL_PASSWORD` which is consistent with documentation.

Also changed warning to info, as per discussion in #120
2016-04-07 15:04:49 -04: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
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