Use SPF and CAA builder. Normalise TTL

[dns.git] / src / osm2pgsql.js

diff --git a/src/osm2pgsql.js b/src/osm2pgsql.js
index 770979ad5a421daa3a38f35d3dcb33f4cdd3728c..070dda9aef2eb4ff893c4321a14fddf4543e8195 100644 (file)
--- a/src/osm2pgsql.js
+++ b/src/osm2pgsql.js
@@ -2,15 +2,23 @@ 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",
+    ],
+  }),
 
   // Main web server and it's aliases
 
-  A("@", "138.201.190.130"),
-  AAAA("@", "2a01:4f8:1c17:6433::1"),
-  A("www", "138.201.190.130"),
-  AAAA("www", "2a01:4f8:1c17:6433::1")
+  A("@", "138.201.190.130", TTL("10m")),
+  AAAA("@", "2a01:4f8:1c17:6433::1", TTL("10m")),
+  A("www", "138.201.190.130", TTL("10m")),
+  AAAA("www", "2a01:4f8:1c17:6433::1", TTL("10m"))
 
 );