Restore spike-06 and drop spike-07

[dns.git] / src / osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 7d83d66f182832939c886d4e9d0953bf510dc0a6..89e71e00d51380d24e8ff0546666deee56c4ccc4 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -13,13 +13,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     ],
   }),
 
-  // Let google handle email
+  // Let mailbox.org handle email
 
-  MX("@", 1, "aspmx.l.google.com."),
-  MX("@", 5, "alt1.aspmx.l.google.com."),
-  MX("@", 5, "alt2.aspmx.l.google.com."),
-  MX("@", 10, "alt3.aspmx.l.google.com."),
-  MX("@", 10, "alt4.aspmx.l.google.com."),
+  MX("@", 10, "mxext1.mailbox.org."),
+  MX("@", 10, "mxext2.mailbox.org."),
+  MX("@", 20, "mxext3.mailbox.org."),
 
   // Handle mail for the join subdomain ourselves
 
@@ -31,9 +29,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "@",
     parts: [
       "v=spf1",
+      "include:mailbox.org",     // mailbox.org
       "include:_spf.google.com", // Google GSuite
-      "ip4:212.110.172.32",      // shenron ipv4
-      "ip6:2001:41c9:1:400::32", // shenron ipv6
       "ip4:184.104.226.98",      // fafnir ipv4
       "ip6:2001:470:1:b3b::2",   // fafnir ipv6
       "ip4:193.60.236.0/24",     // ucl external
@@ -41,7 +38,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "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:mailbox.org",     // mailbox.org
       "-all"
     ]
   }),
@@ -100,6 +96,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("calendar", "ghs.googlehosted.com."),
   CNAME("sites", "ghs.googlehosted.com."),
 
+  // Aliases for mailbox.org services
+
+  CNAME("autoconfig", "mailbox.org."),
+  SRV("_hkps._tcp", 1, 1, 443, "pgp.mailbox.org."),
+
   // Main web server and it's aliases
 
   A("@", RIDLEY_IPV4),
@@ -107,6 +108,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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),
@@ -119,10 +123,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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("staging.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"),
+
   // Nextcloud instance
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 
-  A("hardware", IDRIS_IPV4)
+  A("hardware", IDRIS_IPV4),
+
+  // HTTPS / SVCB records
+  HTTPS("hardware", 1, ".", "alpn=h2")
 
 );