Remove cogent addresses from SPF records

[dns.git] / src / openstreetmap-uk.js

diff --git a/src/openstreetmap-uk.js b/src/openstreetmap-uk.js
index 492e69511e5f7ebf54ca1f02a70d22e4067bac2c..f1f3d320de827ebdb362bb07dc64adfc72e3a8ec 100644 (file)
--- a/src/openstreetmap-uk.js
+++ b/src/openstreetmap-uk.js
@@ -2,9 +2,16 @@ 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: "@",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+    ],
+    issuewild: [
+      "letsencrypt.org",
+    ],
+  }),
 
   // Let the main domain handle the email
 
@@ -12,7 +19,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Delegate SPF policy to the main domain
 
-  TXT("@", "v=spf1 include:openstreetmap.org -all"),
+  SPF_BUILDER({
+    label: "@",
+    parts: [
+      "v=spf1",
+      "include:openstreetmap.org",      // main openstreetmap.org spf record
+      "-all"
+    ]
+  }),
 
   // Delegate MTA-STS policy to the main domain
 
@@ -30,40 +44,40 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Aerial imagery sites
 
-  A("hampshire.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("hampshire.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("a.hampshire.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("a.hampshire.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("b.hampshire.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("b.hampshire.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("c.hampshire.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("c.hampshire.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-
-  A("surrey.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("surrey.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("a.surrey.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("a.surrey.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("b.surrey.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("b.surrey.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("c.surrey.aerial", "178.250.74.36", TTL("1h")),
-  AAAA("c.surrey.aerial", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-
-  A("os", "178.250.74.36", TTL("1h")),
-  AAAA("os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("a.os", "178.250.74.36", TTL("1h")),
-  AAAA("a.os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("b.os", "178.250.74.36", TTL("1h")),
-  AAAA("b.os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("c.os", "178.250.74.36", TTL("1h")),
-  AAAA("c.os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-
-  A("ea", "178.250.74.36", TTL("1h")),
-  AAAA("ea", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("a.ea", "178.250.74.36", TTL("1h")),
-  AAAA("a.ea", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("b.ea", "178.250.74.36", TTL("1h")),
-  AAAA("b.ea", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("c.ea", "178.250.74.36", TTL("1h")),
-  AAAA("c.ea", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h"))
+  A("hampshire.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("hampshire.aerial", KESSIE_IPV6, TTL("1h")),
+  A("a.hampshire.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("a.hampshire.aerial", KESSIE_IPV6, TTL("1h")),
+  A("b.hampshire.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("b.hampshire.aerial", KESSIE_IPV6, TTL("1h")),
+  A("c.hampshire.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("c.hampshire.aerial", KESSIE_IPV6, TTL("1h")),
+
+  A("surrey.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("surrey.aerial", KESSIE_IPV6, TTL("1h")),
+  A("a.surrey.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("a.surrey.aerial", KESSIE_IPV6, TTL("1h")),
+  A("b.surrey.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("b.surrey.aerial", KESSIE_IPV6, TTL("1h")),
+  A("c.surrey.aerial", KESSIE_IPV4, TTL("1h")),
+  AAAA("c.surrey.aerial", KESSIE_IPV6, TTL("1h")),
+
+  A("os", KESSIE_IPV4, TTL("1h")),
+  AAAA("os", KESSIE_IPV6, TTL("1h")),
+  A("a.os", KESSIE_IPV4, TTL("1h")),
+  AAAA("a.os", KESSIE_IPV6, TTL("1h")),
+  A("b.os", KESSIE_IPV4, TTL("1h")),
+  AAAA("b.os", KESSIE_IPV6, TTL("1h")),
+  A("c.os", KESSIE_IPV4, TTL("1h")),
+  AAAA("c.os", KESSIE_IPV6, TTL("1h")),
+
+  A("ea", KESSIE_IPV4, TTL("1h")),
+  AAAA("ea", KESSIE_IPV6, TTL("1h")),
+  A("a.ea", KESSIE_IPV4, TTL("1h")),
+  AAAA("a.ea", KESSIE_IPV6, TTL("1h")),
+  A("b.ea", KESSIE_IPV4, TTL("1h")),
+  AAAA("b.ea", KESSIE_IPV6, TTL("1h")),
+  A("c.ea", KESSIE_IPV4, TTL("1h")),
+  AAAA("c.ea", KESSIE_IPV6, TTL("1h"))
 
 );