Use osm_web_service for all domains

[dns.git] / src / osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index d64efe0634018de5dbbcee612e60df00cdd4e0c9..0ad8995dcc87ec207a97a72b5cd874f1a02467d8 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -31,13 +31,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "v=spf1",
       "include:mailbox.org",     // mailbox.org
       "include:_spf.google.com", // Google GSuite
-      "ip4:184.104.226.98",      // fafnir ipv4
-      "ip6:2001:470:1:b3b::2",   // fafnir ipv6
-      "ip4:193.60.236.0/24",     // ucl external
-      "ip4:184.104.179.128/27",  // amsterdam external
-      "ip6:2001:470:1:fa1::/64", // amsterdam external
-      "ip4:184.104.226.96/27",   // dublin external
-      "ip6:2001:470:1:b3b::/64", // dublin external
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -46,13 +40,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "wiki",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",      // fafnir ipv4
-      "ip6:2001:470:1:b3b::2",   // fafnir ipv6
-      "ip4:193.60.236.0/24",     // ucl external
-      "ip4:184.104.179.128/27",  // amsterdam external
-      "ip6:2001:470:1:fa1::/64", // amsterdam external
-      "ip4:184.104.226.96/27",   // dublin external
-      "ip6:2001:470:1:b3b::/64", // dublin external
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -103,49 +91,27 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web server and it's aliases
 
-  A("@", RIDLEY_IPV4),
-  A("www", RIDLEY_IPV4),
-  A("wiki", RIDLEY_IPV4),
-  A("blog", RIDLEY_IPV4),
-  A("crm", RIDLEY_IPV4),
-  A("join", RIDLEY_IPV4),
-  A("support", RIDLEY_IPV4),
-  A("supporting", RIDLEY_IPV4),
-  A("donate", RIDLEY_IPV4),
-
-  A("board", RIDLEY_IPV4),
-  A("dwg", RIDLEY_IPV4),
-  A("mwg", RIDLEY_IPV4),
-  A("operations", NAGA_IPV4),
-  AAAA("operations", NAGA_IPV6),
-
-  // HTTPS / SVCB records
-  HTTPS("www", 1, ".", "alpn=h2"),
-  HTTPS("wiki", 1, ".", "alpn=h2"),
-  HTTPS("blog", 1, ".", "alpn=h2"),
-  HTTPS("crm", 1, ".", "alpn=h2"),
-  HTTPS("join", 1, ".", "alpn=h2"),
-  HTTPS("support", 1, ".", "alpn=h2"),
-  HTTPS("supporting", 1, ".", "alpn=h2"),
-  HTTPS("donate", 1, ".", "alpn=h2"),
-  HTTPS("board", 1, ".", "alpn=h2"),
-  HTTPS("dwg", 1, ".", "alpn=h2"),
-  HTTPS("mwg", 1, ".", "alpn=h2"),
-  HTTPS("operations", 1, ".", "alpn=h2"),
+  osm_web_service("@", "ridley"),
+  osm_web_service("www", "ridley"),
+  osm_web_service("wiki", "ridley"),
+  osm_web_service("blog", "ridley"),
+  osm_web_service("crm", "ridley"),
+  osm_web_service("join", "ridley"),
+  osm_web_service("support", "ridley"),
+  osm_web_service("supporting", "ridley"),
+  osm_web_service("donate", "ridley"),
+  osm_web_service("board", "ridley"),
+  osm_web_service("dwg", "ridley"),
+  osm_web_service("mwg", "ridley"),
+  osm_web_service("operations", "naga.he"),
 
   // Nextcloud instance
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 
   // Staging Blog
-  A("staging.blog", TABALUGA_IPV4),
-  AAAA("staging.blog", TABALUGA_IPV6),
-  // HTTPS / SVCB records
-  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+  osm_web_service("staging.blog", "tabaluga"),
 
-  A("hardware", IDRIS_IPV4),
-
-  // HTTPS / SVCB records
-  HTTPS("hardware", 1, ".", "alpn=h2")
+  osm_web_service("hardware", "idris.he"),
 
 );