2adc559a43
Fixed part of tests for #109
2016-04-15 21:02:41 +02:00
a8d5cfeb45
Merge pull request #134 from KyleOndy/makefile_cleanup
...
Makefile cleanup
2016-04-15 20:11:18 +02:00
6be463299a
`make build` builds with cache
...
As `make build-no-cache` was added, it seems appropriate that `make
build` should build with the cache, so I have removed the `--no-cache`
option.
2016-04-15 09:54:23 -04:00
0674196ef9
Remove trailing whitespace
2016-04-15 09:54:07 -04:00
d6f9ffe9a6
Fixed some tests for #109
2016-04-13 23:16:46 +02:00
bfa8a41712
Added a build using cache for testing purpose
2016-04-13 21:43:25 +02:00
545922fefa
Fixed paths
2016-04-13 21:43:15 +02:00
884e7ab105
I think the main reason to have the docker-mailserer image is so that one can really quickly start an email server for a couple of user accounts without being an expert in postfix/etc. And for testing sometimes pop access could be quite important. It took me a few hours to get it running; and with this page it should make it much easier for other novices.
2016-04-12 15:00:44 +02:00
1db622cab9
Added dynamic tag name from the current branch
2016-04-12 09:48:12 +02:00
d460b817ce
Renamed
2016-04-12 09:43:13 +02:00
fc2e2ae591
Added folder target, simplified user configuration, few renames... Need to work on tests....
2016-04-12 00:04:33 +02:00
ad5536057a
Merge branch 'v2' of github.com:tomav/docker-mailserver into v2
2016-04-11 22:09:12 +02:00
69b7bb3128
Merge pull request #123 from 00angus/v2
...
Dovecot based mailserver (#109 )
2016-04-11 13:43:22 +02:00
56b8b12966
Modified the name of the image being created by adding the version: dovecot.
2016-04-09 00:50:48 +02:00
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
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
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
c1cc865a0b
Initial commit of v2 branch
2016-04-08 15:07:53 +02:00
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
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
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
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
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
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
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
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
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
735bbcae34
Merge pull request #111 from Reldeis/master
...
Add eol to letsencrypt provided files [Issue #110 ]
2016-03-31 10:48:05 +02:00
09315d3d3c
Add eol to letsencrypt provided files
2016-03-30 11:51:40 +02:00
8c6464d430
Merge pull request #108 from dominikbechstein/logrotate_fix
...
fixed log rotate
2016-03-26 10:13:18 +01:00
b7355656bf
Merge branch 'master' into logrotate_fix
2016-03-26 06:12:05 +01:00
8cc9df8bae
Merge remote-tracking branch 'origin/logrotate_fix'
2016-03-26 06:04:21 +01:00
55cfa30491
Merge pull request #104 from Chris54721/relay
...
Relay support & duplicate DKIM fix
2016-03-18 20:45:06 +01:00
53959b8eae
Add tests for SASL_PASSWD
2016-03-18 20:12:18 +01:00
ec5837d496
Update start-mailserver.sh
2016-03-18 20:10:05 +01:00
3cabf10520
Add tests for main.cf overrides
2016-03-18 20:07:58 +01:00
19fed39dc4
Merge remote-tracking branch 'upstream/master' into relay
2016-03-18 20:00:48 +01:00
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
7ad0ed0bed
Updated FAQ (markdown)
2016-03-04 18:59:32 +01:00
2c886fa3cd
Updated FAQ (markdown)
2016-03-04 18:57:22 +01:00
94a2c9a798
Updated FAQ (markdown)
2016-03-04 18:56:45 +01:00
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
cbf72bdb53
Better documentation for SMTP_ONLY environment variable
2016-03-01 01:04:31 +00:00
ca35e0e313
on special request also some documentation
2016-03-01 00:21:23 +01:00
2769269bd6
new SMTP_ONLY environment option to disable all courier daemons
2016-02-29 23:52:10 +01:00
3c2bc6ccac
Merge pull request #90 from emazzotta/patch-1
...
Allowing CA signed custom certificates
2016-02-27 20:11:47 +01:00
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
ab9fd69052
Fixed test file now moved to "bats"
2016-02-25 12:15:33 +01:00
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
890b70a133
Fixes 84 => moved to bats unit test framework
2016-02-25 00:17:01 +01:00
Thomas VIAL
Kyle Ondy
awb99
angus
Thomas Willems
Dominik Bechstein
Chris54721
Marko J
Emanuele Mazzotta