From b3509e6fba719cc74f727206f3ff827801dea38d Mon Sep 17 00:00:00 2001 From: David Duque Date: Tue, 28 Sep 2021 23:12:15 +0100 Subject: [PATCH] Fix merging deleting ttl's from some records --- management/dns_update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/management/dns_update.py b/management/dns_update.py index db34abde..9f562e86 100755 --- a/management/dns_update.py +++ b/management/dns_update.py @@ -288,7 +288,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True) # the domain, and no one else. # Skip if the user has set a custom SPF record. if not has_rec(None, "TXT", prefix="v=spf1 "): - records.append((None, "TXT", 'v=spf1 mx -all', "Recommended. Specifies that only the box is permitted to send @%s mail." % domain)) + records.append((None, "TXT", 'v=spf1 mx -all', "Recommended. Specifies that only the box is permitted to send @%s mail." % domain, None)) # Append the DKIM TXT record to the zone as generated by OpenDKIM. # Skip if the user has set a DKIM record already. @@ -297,7 +297,7 @@ def build_zone(domain, domain_properties, additional_records, env, is_zone=True) m = re.match(r'(\S+)\s+IN\s+TXT\s+\( ((?:"[^"]+"\s+)+)\)', orf.read(), re.S) val = "".join(re.findall(r'"([^"]+)"', m.group(2))) if not has_rec(m.group(1), "TXT", prefix="v=DKIM1; "): - records.append((m.group(1), "TXT", val, "Recommended. Provides a way for recipients to verify that this machine sent @%s mail." % domain)) + records.append((m.group(1), "TXT", val, "Recommended. Provides a way for recipients to verify that this machine sent @%s mail." % domain, None)) # Append a DMARC record. # Skip if the user has set a DMARC record already.