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

Made changes recommended by JoshData.

This commit is contained in:
Brian Bustin 2015-07-02 08:56:58 -04:00
parent be586e4006
commit 8d79945812
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
management/dns_update.py
View File

@ -145,10 +145,11 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
# Define ns2.PRIMARY_HOSTNAME or whatever the user overrides. # Define ns2.PRIMARY_HOSTNAME or whatever the user overrides.
# User may provide one or more additional nameservers # User may provide one or more additional nameservers
if get_secondary_dns(additional_records): secondary_dns_records = get_secondary_dns(additional_records)
[records.append((None, "NS", secondary_ns+'.', False)) for secondary_ns in get_secondary_dns(additional_records)] if len(secondary_dns_records) > 0:
for secondary_ns in secondary_dns_records:
records.append((None, "NS", secondary_ns+'.', False))
else: else:
secondary_ns = get_secondary_dns(additional_records) or ()
records.append((None, "NS", "ns2." + env["PRIMARY_HOSTNAME"] + '.', False)) records.append((None, "NS", "ns2." + env["PRIMARY_HOSTNAME"] + '.', False))
@ -809,9 +810,7 @@ def get_secondary_dns(custom_dns, dns_type=['_secondary_nameserver']):
if qname in dns_type: if qname in dns_type:
if isinstance(value, str): if isinstance(value, str):
values.append(value) values.append(value)
if len(values) > 0: return values
return values
return None
def set_secondary_dns(hostname, env): def set_secondary_dns(hostname, env):
hostnames = [item.strip().lower() for item in hostname] hostnames = [item.strip().lower() for item in hostname]
@ -918,5 +917,5 @@ if __name__ == "__main__":
for zone, records in build_recommended_dns(env): for zone, records in build_recommended_dns(env):
for record in records: for record in records:
print("; " + record['explanation']) print("; " + record['explanation'])
print(record['qname'], record['rtype'], record['value']) print(record['qname'], record['rtype'], record['value'], sep="\t")
print() print()