mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
133eb9bc2e
* chore: Drop ENV `ENABLE_POSTFIX_VIRTUAL_TRANSPORT` * tests(chore): Remove redundant `dovecot-lmtp` config None of this is needed. Only relevant change is changing the LMTP service listener for Dovecot and that can be delegated to `user-patches.sh`. * tests(refactor): Use `user-patches.sh` instead of replacing config file The only relevant changes in `test/config/dovecot-lmtp` regarding LMTP was: - `/etc/dovecot/dovecot.conf` (`protocols = imap lmtp`) and `/etc/dovecot/protocols.d/` (`protocols = $protocols lmtp`). - `conf.d/10-master.conf` only changed the LMTP service listener from a unix socket to TCP on port 24 (_this was the only change required for the test to pass_). None of those configs are required as: - `protocols = imap pop3 lmtp` [is the upstream default](https://doc.dovecot.org/settings/core/#core_setting-protocols), no need to add `lmtp`. - The LMTP service listener is now configured for the test with `user-patches.sh`. * tests(refactor): `mail_lmtp_ip.bats` - Converted to new testing conventions and common container helpers. - `ENABLE_POSTFIX_VIRTUAL_TRANSPORT` was not relevant, dropped. - Revised test cases, logic remains the same. - Large custom config used was not documented and doesn't appear to serve any purpose. Simplified by replacing with a single modification with `user-patches.sh`. - Added some additional comments for context of test and improvements that could be made. * tests(chore): Adjust comments The comment from `mail_hostname` provides no valid context, it was likely copied over from `tests.bats` in Oct 2020 by accident. The email sent is just for testing, nothing relevant to LMTP. --- Added additional comment for test to reference extra information from. * tests(chore): Update similar log line matching Extracts out the match pattern and formatting commands into separate vars (reduces horizontal scrolling), and includes extra docs about what the matched line should be expected to look like.
28 lines
666 B
Bash
28 lines
666 B
Bash
#!/bin/bash
|
|
##
|
|
# This user script will be executed between configuration and starting daemons
|
|
# To enable it you must save it in your config directory as "user-patches.sh"
|
|
##
|
|
echo "[user-patches.sh] Changing Dovecot LMTP service listener from a unix socket to TCP on port 24"
|
|
sedfile -i \
|
|
-e "s|unix_listener lmtp|inet_listener lmtp|" \
|
|
-e "s|mode = 0660|address = 0.0.0.0|" \
|
|
-e "s|group = postfix|port = 24|" \
|
|
/etc/dovecot/conf.d/10-master.conf
|
|
|
|
### Before / After ###
|
|
|
|
# service lmtp {
|
|
# unix_listener lmtp {
|
|
# mode = 0660
|
|
# group = postfix
|
|
# }
|
|
# }
|
|
|
|
# service lmtp {
|
|
# inet_listener lmtp {
|
|
# address = 0.0.0.0
|
|
# port = 24
|
|
# }
|
|
# }
|