Fix SPF for osmfoundation (otrs). Remove record duplication

[dns.git] / src / osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 89e71e00d51380d24e8ff0546666deee56c4ccc4..642e58455f2b82432c404c50beeecd82a5f21dc7 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
       "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"
     ]
   }),
       "-all"
     ]
   }),


@@ -46,13 +40,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "wiki",
     parts: [
       "v=spf1",
     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"
     ]
   }),
       "-all"
     ]
   }),


@@ -103,31 +91,26 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web server and it's aliases
 
 
   // Main web server and it's aliases
 

-  A("@", RIDLEY_IPV4),
-  A("www", RIDLEY_IPV4),
-  A("wiki", RIDLEY_IPV4),
-  A("blog", RIDLEY_IPV4),
-
-  A("staging.blog", FUME_IPV4),
-  AAAA("staging.blog", FUME_IPV6),
-
-  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),
+  A("@", IPV4["ridley"]),
+  A("www", IPV4["ridley"]),
+  A("wiki", IPV4["ridley"]),
+  A("blog", IPV4["ridley"]),
+  A("crm", IPV4["ridley"]),
+  A("join", IPV4["ridley"]),
+  A("support", IPV4["ridley"]),
+  A("supporting", IPV4["ridley"]),
+  A("donate", IPV4["ridley"]),
+
+  A("board", IPV4["ridley"]),
+  A("dwg", IPV4["ridley"]),
+  A("mwg", IPV4["ridley"]),
+  A("operations", IPV4["naga.he"]),
+  AAAA("operations", IPV6["naga.he"]),

 
   // HTTPS / SVCB records
   HTTPS("www", 1, ".", "alpn=h2"),
   HTTPS("wiki", 1, ".", "alpn=h2"),
   HTTPS("blog", 1, ".", "alpn=h2"),
 
   // HTTPS / SVCB records
   HTTPS("www", 1, ".", "alpn=h2"),
   HTTPS("wiki", 1, ".", "alpn=h2"),
   HTTPS("blog", 1, ".", "alpn=h2"),

-  HTTPS("staging.blog", 1, ".", "alpn=h2"),

   HTTPS("crm", 1, ".", "alpn=h2"),
   HTTPS("join", 1, ".", "alpn=h2"),
   HTTPS("support", 1, ".", "alpn=h2"),
   HTTPS("crm", 1, ".", "alpn=h2"),
   HTTPS("join", 1, ".", "alpn=h2"),
   HTTPS("support", 1, ".", "alpn=h2"),


@@ -142,7 +125,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 

-  A("hardware", IDRIS_IPV4),
+  // Staging Blog
+  A("staging.blog", IPV4["tabaluga"]),
+  AAAA("staging.blog", IPV6["tabaluga"]),
+  // HTTPS / SVCB records
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+
+  A("hardware", IPV4["idris.he"]),

 
   // HTTPS / SVCB records
   HTTPS("hardware", 1, ".", "alpn=h2")
 
   // HTTPS / SVCB records
   HTTPS("hardware", 1, ".", "alpn=h2")