external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-12-25 07:47:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop-dns-mods' of https://github.com/kiekerjan/mailinabox into develop-dns-mods

Browse Source
This commit is contained in:
github@kiekerjan.isdronken.nl 2021-05-24 14:24:18 +02:00
commit d88d7d0371
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
management/dns_update.py
View File

@ -154,7 +154,7 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
if os.path.exists("/etc/usehiddenmasterdns") and len(secondary_ns_list) > 1: if os.path.exists("/etc/usehiddenmasterdns") and len(secondary_ns_list) > 1:
with open("/etc/usehiddenmasterdns") as f: with open("/etc/usehiddenmasterdns") as f:
for line in f: for line in f:
if line == domain or line == "usehiddenmasterdns": if line.strip() == domain or line.strip() == "usehiddenmasterdns":
useHiddenMaster = True useHiddenMaster = True
break break
@ -518,7 +518,7 @@ $TTL {defttl} ; default time to live
if os.path.exists("/etc/forceshortdnsttl"): if os.path.exists("/etc/forceshortdnsttl"):
with open("/etc/forceshortdnsttl") as f: with open("/etc/forceshortdnsttl") as f:
for line in f: for line in f:
if line == domain or line == "forceshortdnsttl": if line.strip() == domain or line.strip() == "forceshortdnsttl":
# Override the ttl values # Override the ttl values
p_defttl = "5m" p_defttl = "5m"
p_refresh = "30m" p_refresh = "30m"
@ -537,7 +537,7 @@ $TTL {defttl} ; default time to live
if os.path.exists("/etc/usehiddenmasterdns") and len(secondary_ns_list) > 1: if os.path.exists("/etc/usehiddenmasterdns") and len(secondary_ns_list) > 1:
with open("/etc/usehiddenmasterdns") as f: with open("/etc/usehiddenmasterdns") as f:
for line in f: for line in f:
if line == domain or line == "usehiddenmasterdns": if line.strip() == domain or line.strip() == "usehiddenmasterdns":
primary_dns = secondary_ns_list[0] primary_dns = secondary_ns_list[0]
break break