mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00: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> |
||
|---|---|---|
| .. | ||
| bats@54e965fa9d | ||
| config | ||
| docker-openldap | ||
| linting | ||
| test-files | ||
| test_helper | ||
| default_relay_host.bats | ||
| helper-functions.bats | ||
| mail_changedetector.bats | ||
| mail_disabled_clamav_spamassassin.bats | ||
| mail_fail2ban.bats | ||
| mail_fetchmail.bats | ||
| mail_fetchmail_parallel.bats | ||
| mail_hostname.bats | ||
| mail_lmtp_ip.bats | ||
| mail_pop3.bats | ||
| mail_postfix_inet.bats | ||
| mail_postscreen.bats | ||
| mail_privacy.bats | ||
| mail_quotas_disabled.bats | ||
| mail_smtponly.bats | ||
| mail_spam_bounced.bats | ||
| mail_spam_junk_folder.bats | ||
| mail_special_use_folders.bats | ||
| mail_ssl_letsencrypt.bats | ||
| mail_ssl_manual.bats | ||
| mail_tls_dhparams.bats | ||
| mail_undef_spam_subject.bats | ||
| mail_with_imap.bats | ||
| mail_with_ldap.bats | ||
| mail_with_mdbox.bats | ||
| mail_with_postgrey.bats | ||
| mail_with_postgrey_disabled_by_default.bats | ||
| mail_with_relays.bats | ||
| mail_with_sdbox.bats | ||
| no_container.bats | ||
| open_dkim.bats | ||
| permit_docker.bats | ||
| security_tls_cipherlists.bats | ||
| test_helper.bats | ||
| tests.bats | ||