Merge branch 'master' into ldap

This commit is contained in:
downtownallday
2020-05-29 17:11:39 -04:00
12 changed files with 191 additions and 24 deletions
+3
View File
@@ -33,6 +33,9 @@ def get_web_domains(env, include_www_redirects=True, exclude_dns_elsewhere=True,
domains |= set('autoconfig.' + maildomain for maildomain in get_mail_domains(env, category='mail'))
domains |= set('autodiscover.' + maildomain for maildomain in get_mail_domains(env, category='mail'))
# 'mta-sts.' for MTA-STS support.
domains |= set('mta-sts.' + maildomain for maildomain in get_mail_domains(env))
if exclude_dns_elsewhere:
# ...Unless the domain has an A/AAAA record that maps it to a different
# IP address than this box. Remove those domains from our list.