mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-04-19 15:02:18 +03:00
47f8d50beb
* chore: Detect missing final newline in configs read These lines will be not be processed by `read`, emit a warning to raise awareness. * fix: Ensure parsed config has final newline appended (when possible) This functionality was handled in `accounts.sh` via a similar sed command (that the linked references also offer). `printf` is better for this, no shellcheck comment required either. We additionally don't attempt to modify files that are read-only. * fix: Ensure parsed configs have CRLF to LF corrected (where possible) Likewise, this runtime fix was only covering two config files. It now applies to all callers of this method. * fix: Sanitize `postfix-master.cf` via helper This feature should have been using the helper to avoid user error from their config updates accidentally introducing subtle breakage implicitly (due to CRLF or missing final newline). * tests: Add test cases for new helpers * tests: `rm` is redundant when using `BATS_TEST_TMPDIR` This temporary directory is created and removed implicitly. Even after a test failure. * chore: Remove old `postfix-virtual.cf` migration logic This was introduced in 2018, there should be no one needing to rely on this anymore? * tests: Remove comment on sed failure concern * chore: Add entry to `CHANGELOG.md` * Apply suggestions from code review Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> --------- Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
51 lines
1.8 KiB
Bash
51 lines
1.8 KiB
Bash
#!/bin/bash
|
|
# Support for Postfix aliases
|
|
|
|
# NOTE: LDAP doesn't appear to use this, but the docs page: "Use Cases | Forward-Only Mail-Server with LDAP"
|
|
# does have an example where /etc/postfix/virtual is referenced in addition to ldap config for Postfix `main.cf:virtual_alias_maps`.
|
|
# `setup-stack.sh:_setup_ldap` does not seem to configure for `/etc/postfix/virtual however.`
|
|
|
|
# NOTE: `accounts.sh` and `relay.sh:_populate_relayhost_map` also process on `postfix-virtual.cf`.
|
|
function _handle_postfix_virtual_config() {
|
|
: >/etc/postfix/virtual
|
|
|
|
local DATABASE_VIRTUAL=/tmp/docker-mailserver/postfix-virtual.cf
|
|
|
|
if [[ -f ${DATABASE_VIRTUAL} ]]; then
|
|
cp -f "${DATABASE_VIRTUAL}" /etc/postfix/virtual
|
|
else
|
|
_log 'debug' "'${DATABASE_VIRTUAL}' not provided - no mail alias/forward created"
|
|
fi
|
|
}
|
|
|
|
# TODO: Investigate why this file is always created, nothing seems to append only the cp below?
|
|
function _handle_postfix_regexp_config() {
|
|
: >/etc/postfix/regexp
|
|
|
|
if [[ -f /tmp/docker-mailserver/postfix-regexp.cf ]]; then
|
|
_log 'trace' "Adding regexp alias file postfix-regexp.cf"
|
|
|
|
cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp
|
|
_add_to_or_update_postfix_main 'virtual_alias_maps' 'pcre:/etc/postfix/regexp'
|
|
fi
|
|
}
|
|
|
|
function _handle_postfix_aliases_config() {
|
|
_log 'trace' 'Configuring root alias'
|
|
|
|
echo "root: ${POSTMASTER_ADDRESS}" >/etc/aliases
|
|
|
|
local DATABASE_ALIASES='/tmp/docker-mailserver/postfix-aliases.cf'
|
|
[[ -f ${DATABASE_ALIASES} ]] && cat "${DATABASE_ALIASES}" >>/etc/aliases
|
|
|
|
_adjust_mtime_for_postfix_maincf
|
|
postalias /etc/aliases
|
|
}
|
|
|
|
# Other scripts should call this method, rather than the ones above:
|
|
function _create_aliases() {
|
|
_handle_postfix_virtual_config
|
|
_handle_postfix_regexp_config
|
|
_handle_postfix_aliases_config
|
|
}
|