X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/1be3432c92788727d1bae95ec9e3a02762132610..5735b2e667f965a3c1001389f0b60d216654eb9a:/src/openstreetmap-za.js

diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js
index 8438475..78061ef 100644
--- a/src/openstreetmap-za.js
+++ b/src/openstreetmap-za.js
@@ -2,9 +2,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish CAA records indicating that only letsencrypt should issue certificates
 
-  CAA("@", "issue", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "issuewild", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "iodef", "mailto:hostmaster@openstreetmap.org"),
+  CAA_BUILDER({
+    label: "@",
+    ttl: "1h",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+    ],
+    issuewild: [
+      "letsencrypt.org",
+    ],
+  }),
 
   // Let the main domain handle the email
 
@@ -12,7 +20,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Delegate SPF policy to the main domain
 
-  TXT("@", "v=spf1 include:openstreetmap.org -all"),
+  SPF_BUILDER({
+    label: "@",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "include:openstreetmap.org",      // main openstreetmap.org spf record
+      "-all"
+    ]
+  }),
 
   // Delegate MTA-STS policy to the main domain
 
@@ -26,38 +42,38 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Aerial imagery sites on draco
 
-  A("aerial", "193.60.236.12", TTL("10m")),
-  A("a.aerial", "193.60.236.12", TTL("10m")),
-  A("b.aerial", "193.60.236.12", TTL("10m")),
-  A("c.aerial", "193.60.236.12", TTL("10m")),
+  A("aerial", DRACO_IPV4, TTL("10m")),
+  A("a.aerial", DRACO_IPV4, TTL("10m")),
+  A("b.aerial", DRACO_IPV4, TTL("10m")),
+  A("c.aerial", DRACO_IPV4, TTL("10m")),
 
   // Aerial imagery sites on kessie
 
-  A("coct.aerial", "178.250.74.36", TTL("30m")),
-  AAAA("coct.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("a.coct.aerial", "178.250.74.36", TTL("30m")),
-  AAAA("a.coct.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("b.coct.aerial", "178.250.74.36", TTL("30m")),
-  AAAA("b.coct.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("c.coct.aerial", "178.250.74.36", TTL("30m")),
-  AAAA("c.coct.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-
-  A("topo", "178.250.74.36", TTL("30m")),
-  AAAA("topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("a.topo", "178.250.74.36", TTL("30m")),
-  AAAA("a.topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("b.topo", "178.250.74.36", TTL("30m")),
-  AAAA("b.topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("c.topo", "178.250.74.36", TTL("30m")),
-  AAAA("c.topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-
-  A("namibia-topo", "178.250.74.36", TTL("30m")),
-  AAAA("namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("a.namibia-topo", "178.250.74.36", TTL("30m")),
-  AAAA("a.namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("b.namibia-topo", "178.250.74.36", TTL("30m")),
-  AAAA("b.namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
-  A("c.namibia-topo", "178.250.74.36", TTL("30m")),
-  AAAA("c.namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m"))
+  A("coct.aerial", KESSIE_IPV4, TTL("30m")),
+  AAAA("coct.aerial", KESSIE_IPV6, TTL("30m")),
+  A("a.coct.aerial", KESSIE_IPV4, TTL("30m")),
+  AAAA("a.coct.aerial", KESSIE_IPV6, TTL("30m")),
+  A("b.coct.aerial", KESSIE_IPV4, TTL("30m")),
+  AAAA("b.coct.aerial", KESSIE_IPV6, TTL("30m")),
+  A("c.coct.aerial", KESSIE_IPV4, TTL("30m")),
+  AAAA("c.coct.aerial", KESSIE_IPV6, TTL("30m")),
+
+  A("topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("topo", KESSIE_IPV6, TTL("30m")),
+  A("a.topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("a.topo", KESSIE_IPV6, TTL("30m")),
+  A("b.topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("b.topo", KESSIE_IPV6, TTL("30m")),
+  A("c.topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("c.topo", KESSIE_IPV6, TTL("30m")),
+
+  A("namibia-topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("namibia-topo", KESSIE_IPV6, TTL("30m")),
+  A("a.namibia-topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("a.namibia-topo", KESSIE_IPV6, TTL("30m")),
+  A("b.namibia-topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("b.namibia-topo", KESSIE_IPV6, TTL("30m")),
+  A("c.namibia-topo", KESSIE_IPV4, TTL("30m")),
+  AAAA("c.namibia-topo", KESSIE_IPV6, TTL("30m"))
 
 );