mirror of
https://github.com/docker-mailserver/docker-mailserver
synced 2024-05-27 14:46:06 +02:00
5254f7c658
Removes duplicate logic from `check-for-changes.sh` that is used/maintained elsewhere to avoid risk of problems, as this code is already starting to diverge / rot. --- Previously the change detection support has had code added for rebuilding config upon change detection which is the same as code run during startup scripts. Unfortunately over time this has fallen out of sync. Mostly the startup scripts would get maintenance and the contributor and reviewers may not have been aware of the duplicate code handled by `check-for-changes.sh`. That code was starting to diverge in addition to some changes in structure (_eg: relay host logic seems interleaved here vs separated out in startup scripts_). I wanted to address this before it risks becoming a much bigger headache. Rather than bloat `helper-functions.sh` further, I've added a `helpers/` folder extracting relevant common logic between startup scripts and `changedetector`. If you want to follow that process I've kept scoped commits to make those diffs easier. Some minor changes/improvements were added but nothing significant. --- - chore: Extract relay host logic to new `relay.sh` helper - chore: Extract `/etc/postfix/sasl_passwd` logic to new `sasl.sh` helper - chore: Extract `postfix-accounts.cf` logic to new `accounts.sh` helper - chore: Extract `/etc/aliases` logic to new `aliases.sh` helper - chore: Extract `/etc/postfix/vhost` logic to new `postfix.sh` helper - chore: Add inline docs for Postfix configs > These are possibly more verbose than needed and can be reduced at a later stage. > They are helpful during this refactor process while investigating that everything is handled correctly. `accounts.sh`: - Add note regarding potential bug for bare domain setups with `/etc/postfix/vhost` and `mydestination` sharing same domain value. `relay.sh`: - Remove the tabs for a single space delimiter, revised associated comment. - Add PR reference for original `_populate_relayhost_map` implementation which has some useful details. Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> Co-authored-by: Casper <casperklein@users.noreply.github.com>
53 lines
2.7 KiB
Bash
Executable File
53 lines
2.7 KiB
Bash
Executable File
#! /bin/bash
|
|
# Support for Postfix features
|
|
|
|
# Docs - virtual_mailbox_domains (Used in /etc/postfix/main.cf):
|
|
# http://www.postfix.org/ADDRESS_CLASS_README.html#virtual_mailbox_class
|
|
# http://www.postfix.org/VIRTUAL_README.html
|
|
# > If you omit this setting then Postfix will reject mail (relay access denied) or will not be able to deliver it.
|
|
# > NEVER list a virtual MAILBOX domain name as a `mydestination` domain!
|
|
# > NEVER list a virtual MAILBOX domain name as a virtual ALIAS domain!
|
|
#
|
|
# > Execute the command "postmap /etc/postfix/virtual" after changing the virtual file,
|
|
# > execute "postmap /etc/postfix/vmailbox" after changing the vmailbox file,
|
|
# > and execute the command "postfix reload" after changing the main.cf file.
|
|
#
|
|
# - virtual_alias_domains is not used by docker-mailserver at present, although LDAP docs reference it.
|
|
# - `postmap` only seems relevant when the lookup type is one of these `file_type` values: http://www.postfix.org/postmap.1.html
|
|
# Should not be a concern for most types used by `docker-mailserver`: texthash, ldap, pcre, tcp, unionmap, unix.
|
|
# The only other type in use by `docker-mailserver` is the hash type for /etc/aliases, which `postalias` handles.
|
|
function _create_postfix_vhost
|
|
{
|
|
# `main.cf` configures `virtual_mailbox_domains = /etc/postfix/vhost`
|
|
# NOTE: Amavis also consumes this file.
|
|
: >/etc/postfix/vhost
|
|
|
|
# Account and Alias generation will store values in `/tmp/vhost.tmp`.
|
|
# Filter unique values to the proper config.
|
|
# NOTE: LDAP stores the domain value set by `docker-mailserver`,
|
|
# and correctly removes it from `mydestination` in `main.cf` in `setup-stack.sh`.
|
|
if [[ -f /tmp/vhost.tmp ]]
|
|
then
|
|
sort < /tmp/vhost.tmp | uniq >> /etc/postfix/vhost
|
|
rm /tmp/vhost.tmp
|
|
fi
|
|
}
|
|
|
|
# Docs - Postfix lookup table files:
|
|
# http://www.postfix.org/DATABASE_README.html
|
|
#
|
|
# Types used in scripts or config: ldap, texthash, hash, pcre, tcp, unionmap, unix
|
|
# ldap type changes are network based, no `postfix reload` required.
|
|
# texthash type is read into memory when Postfix process starts, requires `postfix reload` to apply changes.
|
|
# texthash type does not require running `postmap` after changes are made, other types might.
|
|
#
|
|
# Examples of different types actively used:
|
|
# setup-stack.sh:_setup_spoof_protection uses texthash + hash + pcre, and conditionally unionmap
|
|
# main.cf:
|
|
# - alias_maps and alias_database both use hash:/etc/aliases
|
|
# - virtual_mailbox_maps and virtual_alias_maps use texthash
|
|
# - `alias.sh` may append pcre:/etc/postfix/regexp to virtual_alias_maps in `main.cf`
|
|
#
|
|
# /etc/aliases is handled by `alias.sh` and uses `postalias` to update the Postfix alias database. No need for `postmap`.
|
|
# http://www.postfix.org/postalias.1.html
|