Commit graph

742 commits

Author SHA1 Message Date
Vortex 437d3b74cc added test for "checking configuration: user-patches.sh executed" - should fail with this commit 2019-10-31 02:38:45 +01:00
Vortex 5e6969e594 Renamed the sample script in config, as it will be called if people make a copy. Better create a sample file with another name that has to be renamed to activate it. 2019-10-17 13:13:20 +02:00
Vortex c30c3bf5de moved user_patches from misc to nearly the end of setups 2019-10-16 18:56:06 +02:00
Daniel Dobko e441f1318a Tests should work from now on
Merge branch 'user-patches.sh'

# Conflicts:
#	config/user-patches.sh
#	target/start-mailserver.sh
2019-10-08 21:55:46 +02:00
Undercover1989 275a83667a base files 2019-10-08 21:22:12 +02:00
Undercover1989 0975b71d72 chown docker:docker /tmp/docker-mailserver/user-patches.sh 2019-10-08 19:24:01 +02:00
Undercover1989 b5c422c3c5 start user-patches.sh native instead of explicit using the bash-command 2019-10-08 15:08:01 +02:00
Undercover1989 b01071f52f Added optional file ./config/user-patches.sh which is executed between configuration and starting daemons (misc-section) 2019-10-07 21:04:49 +02:00
Erik Wramner 0e7e586ae3
Merge pull request #1277 from ArashFatahzade/master
Removed a dot from .env-mailserver
2019-09-30 08:33:43 +02:00
Arash Fatahzade 96268bb45b
Removed a dot from .env-mailserver 2019-09-29 21:47:09 +03:30
Erik Wramner 5dca9bd469
Merge pull request #1273 from erik-wramner/issue_1271_take_2
Set REPORT_RECIPIENT to postmaster when 0
2019-09-24 21:37:13 +02:00
Erik Wramner 5f9428fcf3 Set REPORT_RECIPIENT to postmaster when 0 2019-09-24 21:09:48 +02:00
Erik Wramner fe3f747c72
Merge pull request #1272 from erik-wramner/fix_1271_wrong_address
Fix report_recipient bugs
2019-09-22 18:42:11 +02:00
Erik Wramner b9515eae4c Fix report_recipient bugs 2019-09-22 17:16:33 +02:00
Erik Wramner dd710cd7bd
Merge pull request #1270 from mindrunner/master
Separate environments and simplify docker-compose.yml
2019-09-21 08:57:26 +02:00
Lukas Elsner 1fce099ade Separate environments and simplify docker-compose.yml 2019-09-20 13:38:13 -06:00
Lukas Elsner e60e2d180e Separate environments and simplify docker-compose.yml 2019-09-20 10:40:37 -06:00
Erik Wramner dc49f16117
Merge pull request #1262 from erik-wramner/issue_1093_logwatch_pflogsum
Fix #1093, pflogsumm and logwatch.
2019-09-16 09:43:38 +02:00
Erik Wramner 2584124ccd Updated readme after code review 2019-09-16 08:05:18 +02:00
Erik Wramner 008b8e6bce Fix #1093, pflogsumm and logwatch 2019-09-16 08:00:35 +02:00
Erik Wramner 0d1e716f36
Merge pull request #1263 from erik-wramner/issue_1143_override_last
Moved Postfix overrides last to fix #1143
2019-09-15 20:02:33 +02:00
Erik Wramner f14c9fc6ce Moved Postfix overrides last to fix #1143 2019-09-15 18:29:46 +02:00
Erik Wramner 2380634d54
Merge pull request #1260 from martin-schulze-vireso/feature/improve_error_output
Better diagnostics for setup timeout
2019-09-13 08:40:17 +02:00
Martin Schulze d9a48878c9 Print last 10 log lines on container setup timeout 2019-09-12 00:43:44 +02:00
Martin Schulze 3f9dd4180a Fix setup_file marker logic 2019-09-12 00:42:04 +02:00
Martin Schulze a20f2c4199 Add pregenerated test/config dh params 2019-09-12 00:42:04 +02:00
Erik Wramner ca821fa51a
Merge pull request #1259 from martin-schulze-vireso/bugfix/no_error_printed_on_timeout
Fix missing error output from timeout
2019-09-11 14:04:04 +02:00
Martin Schulze 3513944d0a Skip all tests of file after failed setup_file 2019-09-11 01:01:51 +02:00
Martin Schulze 8e6152ff2f Fix missing error output from timeout
The exits would prevent the printing code from running
2019-09-11 00:02:16 +02:00
Erik Wramner 7580aec15e
Merge pull request #1254 from erik-wramner/containers_remain_after_clean
Generalize clean to remove all matching containers
2019-09-08 08:23:29 +02:00
Erik Wramner 0bd29bdc8e Generalize clean to remove all matching containers 2019-09-07 20:48:00 +02:00
Erik Wramner 9e7348c8f9
Merge pull request #1253 from erik-wramner/dovecot_ssl_protocols
Fix #1251 intermediate TLS level
2019-09-05 21:37:08 +02:00
Erik Wramner 8f23cb7b35 Adjust wait for tests as they often fail 2019-09-05 21:35:23 +02:00
Erik Wramner 0eef718ed2 Fix #1251 intermediate TLS level 2019-09-05 19:39:33 +02:00
Erik Wramner 205dae6c06
Merge pull request #1246 from fbartels/dovecot-repo
Update readme
2019-09-03 10:13:17 +02:00
Felix Bartels 043e184630 Update readme
reorg dockerfile and add comments
2019-09-02 11:16:21 +02:00
Felix Bartels 697baed324
Merge pull request #1245 from erik-wramner/cve-2019-11500
Use Dovecot repo to fix cve-2019-11500 take two
2019-08-31 09:06:59 +02:00
Erik Wramner 3618939f21 Ignore hadolint error about parameter expansion 2019-08-30 13:51:48 +02:00
Erik Wramner b766b5646b Change repo for dovecot to fix CVE-2019-11500 2019-08-30 13:43:11 +02:00
Erik Wramner 9794fbb21b
Merge pull request #1238 from martin-schulze-vireso/feature/modularize_tests2
WIP: Modularize more tests
2019-08-22 08:44:20 +02:00
Martin Schulze 596563ae64 Make failed test output more readable 2019-08-21 21:16:39 +02:00
Erik Wramner fea5adb432
Merge pull request #1236 from erik-wramner/fix_readme_dovecot_attrs
Corrected docs for dovecot attrs #1234
2019-08-21 12:55:21 +02:00
Erik Wramner 0a9bd1c09d Corrected docs for dovecot attrs #1234 2019-08-21 12:53:53 +02:00
Erik Wramner 47a9ad9ec7
Merge pull request #1233 from jamesfryer/master
Improved documentation for SA_KILL
2019-08-21 12:38:48 +02:00
James Fryer f6ad68d5c9 Improved documentation for SA_KILL 2019-08-21 11:25:10 +01:00
James Fryer 29db9a8f2b Improved documentation for SA_KILL 2019-08-20 13:01:51 +01:00
Felix Bartels 0474141859
Merge pull request #1217 from martin-schulze-vireso/feature/modulariz_tests
WIP: Modularize tests
2019-08-19 08:11:31 +02:00
Martin Schulze bfc4f5693e Don't use run in repeat_until_success_or_timeout
it overwrites the return code of its command
2019-08-17 21:23:48 +02:00
Martin Schulze a933ef27ac Fix polling with pipes 2019-08-17 20:58:33 +02:00
Martin Schulze 43ae814776 Extract mail_with_imap into its own test file 2019-08-17 20:58:33 +02:00