external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

catch-all aiases and domain aliases should not require postmaster@ and admin@ aliases because they'll forward anyway

This commit is contained in:
Joshua Tauberer 2015-01-19 23:18:28 +00:00
parent 1bf8f1991f
commit 85a40da83c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ Setup:
Miscellaneous: Miscellaneous:
* Internationalized domain names (IDNs) are now supported for DNS and web, but email is not yet tested. * Internationalized domain names (IDNs) are now supported for DNS and web, but email is not yet tested.
* Domains that only have a catch-all alias or domain alias no longer automatically create/require admin@ and postmaster@ addresses since they'll forward anyway.
v0.06 (January 4, 2015) v0.06 (January 4, 2015)

10
management/mailconfig.py
View File

@ -469,12 +469,12 @@ def get_required_aliases(env):
aliases.add("hostmaster@" + env['PRIMARY_HOSTNAME']) aliases.add("hostmaster@" + env['PRIMARY_HOSTNAME'])
# Get a list of domains we serve mail for, except ones for which the only # Get a list of domains we serve mail for, except ones for which the only
# email on that domain is a postmaster/admin alias to the administrator. # email on that domain is a postmaster/admin alias to the administrator
# or a wildcard alias (since it will forward postmaster/admin).
real_mail_domains = get_mail_domains(env, real_mail_domains = get_mail_domains(env,
filter_aliases = lambda alias : \ filter_aliases = lambda alias :
(not alias[0].startswith("postmaster@") \ ((not alias[0].startswith("postmaster@") and not alias[0].startswith("admin@")) or alias[1] != get_system_administrator(env))
and not alias[0].startswith("admin@")) \ and not alias[0].startswith("@")
or alias[1] != get_system_administrator(env) \
) )
# Create postmaster@ and admin@ for all domains we serve mail on. # Create postmaster@ and admin@ for all domains we serve mail on.