Revert "Drop stormfly-04 from nominatim"

[dns.git] / src / opengeodata.js

diff --git a/src/opengeodata.js b/src/opengeodata.js
index 815b84038bb389853929af0c3d613ae3636521f3..f7824f2914738e32e1e56e16a30946212d7ab5fd 100644 (file)
--- a/src/opengeodata.js
+++ b/src/opengeodata.js
@@ -2,14 +2,32 @@ 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",
+    ],
+  }),
+
+  // Delegate SPF policy to the main domain
+
+  SPF_BUILDER({
+    label: "@",
+    parts: [
+      "v=spf1",
+      "include:openstreetmap.org",      // main openstreetmap.org spf record
+      "-all"
+    ]
+  }),
 
   // Main web server and it's aliases
 
-  A("@", "193.60.236.19", TTL("10m")),
-  A("old", "193.60.236.19", TTL("10m")),
-  A("www", "193.60.236.19", TTL("10m"))
+  A("@", RIDLEY_IPV4),
+  A("old", RIDLEY_IPV4), // Legacy URL support https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/
+  A("www", RIDLEY_IPV4)
 
-);
+);
\ No newline at end of file