From 13bbf2ce5768bbf2d9b31cac95b4da59055a9ade Mon Sep 17 00:00:00 2001
From: Reid 'arrdem' McKenzie <me@arrdem.com>
Date: Wed, 29 Nov 2023 22:41:10 -0700
Subject: [PATCH] Not sure why this broke, but fixing DNS sync

---
 projects/public_dns/src/python/updater/__init__.py        | 4 ++--
 projects/public_dns/src/resources/zonefiles/arrdem.com.j2 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/public_dns/src/python/updater/__init__.py b/projects/public_dns/src/python/updater/__init__.py
index efd9ba0..42a9245 100644
--- a/projects/public_dns/src/python/updater/__init__.py
+++ b/projects/public_dns/src/python/updater/__init__.py
@@ -8,14 +8,14 @@ import jinja2
 
 
 RECORD_LINE_PATTERN = re.compile(
-    r"^(?P<rrset_name>\S+)\s+(?P<rrset_ttl>\S+)\s+IN\s+(?P<rrset_type>\S+)\s+(?P<rrset_values>[^\s#]+)(?P<comment>\s*#.*?)?$"
+    r"^(?P<rrset_name>\S+)\s+(?P<rrset_ttl>\d+)\s+IN\s+(?P<rrset_type>\S+)\s+(?P<rrset_values>[^#]+)(?P<comment>\s*#.*?)?$"
 )
 
 
 def update(m, k, f, *args, **kwargs):
     """clojure.core/update for Python's stateful maps."""
 
-    if k in m:
+    if k in m and m[k] is not None:
         m[k] = f(m[k], *args, **kwargs)
 
     return m
diff --git a/projects/public_dns/src/resources/zonefiles/arrdem.com.j2 b/projects/public_dns/src/resources/zonefiles/arrdem.com.j2
index 3849115..30e0733 100644
--- a/projects/public_dns/src/resources/zonefiles/arrdem.com.j2
+++ b/projects/public_dns/src/resources/zonefiles/arrdem.com.j2
@@ -12,6 +12,7 @@ paperbrainz {{ ttl }} IN A {{ addr }}
 @                   10800 IN MX    10 in1-smtp.messagingengine.com.
 @                   10800 IN MX    20 in2-smtp.messagingengine.com.
 mesmtp._domainkey   10800 IN TXT      "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/arz66E8pNtYK+jWh57KkT+/bIp2iO9JEVb+9xqb9Z/R/l6zvFsUm5voKdhEJKsYkb35xpWJ699HbXWTENzWCLOvFxpPx8+MOh5i5gQDEg7P8vHfs5dDwj+dH5wQHcYTYPOIm5PFdkKemGwzHayFFOGhr5Xgf4PuiohtWZZSxzwIDAQAB"
+_atproto            10800 IN TXT      "did=did:plc:izyoicsqthvug3v65qkmaops"
 
 email.lists         10800 IN CNAME    mailgun.org.
 lists               10800 IN MX    10 mxa.mailgun.org.