Thomas VIAL
003b89c98b
Fixed typo / text format
2016-04-19 23:25:54 +02:00
Thomas VIAL
c8d6f7451c
Merge pull request #139 from 00angus/v2-fixes
...
Fixes paths for SSL setup, spamassassin and postfix addon config.
2016-04-19 09:24:12 +02:00
angus
d90e67e920
Fixes paths for SSL setup, spamassassin and postfix addon config.
...
Fixes error from logrotate when fail2ban is disabled (failure
when reloading the service).
2016-04-19 00:30:56 +02:00
Thomas VIAL
c63af94788
Changed log location using Dockerfile #109
2016-04-18 23:38:52 +02:00
Thomas VIAL
3f79b6ef7a
Changed log configuration to Dockerfile #109
2016-04-18 23:21:03 +02:00
Thomas VIAL
2c6fdf51c1
Changed log configuration to Dockerfile instead of start-mailserver.cf
2016-04-18 23:18:19 +02:00
Thomas VIAL
180390107e
Changed Fail2ban config for #109
2016-04-18 22:57:39 +02:00
Thomas VIAL
eb11714550
Fixing tests
2016-04-17 23:44:41 +02:00
Thomas VIAL
341aaab9d5
Fixing tests
2016-04-17 23:16:13 +02:00
Thomas VIAL
72d7207690
Fixing last tests on fail2ban regarding #102 and docker-mailserver v2
2016-04-17 22:59:35 +02:00
Thomas VIAL
4d2ec79c18
Merge pull request #136 from 00angus/v2-CItests
...
V2 CI-tests
2016-04-17 22:41:31 +02:00
angus
a6d666b450
Improvements on CI tests: now user account checks are working.
...
Need to work on fail2ban tests.
2016-04-17 20:10:09 +02:00
angus
b35c79a8dd
Adapted the user account setup for the test environment to the new v2 approach
...
(encrypted passwords).
Modified integration tests to adapt to dovecot.
Need to be worked out:
- user accounts checks: dir layout under dovecot probably include dynamic filenames.
How can we handle that ?
- fail2ban container cannot ban via iptables if we do not run it with special
privileges.
2016-04-17 12:01:05 +02:00
Thomas VIAL
2adc559a43
Fixed part of tests for #109
2016-04-15 21:02:41 +02:00
Thomas VIAL
a8d5cfeb45
Merge pull request #134 from KyleOndy/makefile_cleanup
...
Makefile cleanup
2016-04-15 20:11:18 +02:00
Kyle Ondy
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
Kyle Ondy
0674196ef9
Remove trailing whitespace
2016-04-15 09:54:07 -04:00
Thomas VIAL
d6f9ffe9a6
Fixed some tests for #109
2016-04-13 23:16:46 +02:00
Thomas VIAL
bfa8a41712
Added a build using cache for testing purpose
2016-04-13 21:43:25 +02:00
Thomas VIAL
545922fefa
Fixed paths
2016-04-13 21:43:15 +02:00
awb99
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
Thomas VIAL
1db622cab9
Added dynamic tag name from the current branch
2016-04-12 09:48:12 +02:00
Thomas VIAL
d460b817ce
Renamed
2016-04-12 09:43:13 +02:00
Thomas VIAL
fc2e2ae591
Added folder target, simplified user configuration, few renames... Need to work on tests....
2016-04-12 00:04:33 +02:00
Thomas VIAL
ad5536057a
Merge branch 'v2' of github.com:tomav/docker-mailserver into v2
2016-04-11 22:09:12 +02:00
Thomas VIAL
69b7bb3128
Merge pull request #123 from 00angus/v2
...
Dovecot based mailserver (#109 )
2016-04-11 13:43:22 +02:00
angus
56b8b12966
Modified the name of the image being created by adding the version: dovecot.
2016-04-09 00:50:48 +02:00
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
Thomas VIAL
c1cc865a0b
Initial commit of v2 branch
2016-04-08 15:07:53 +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
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
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
