]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
projects / dns.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Minor order tweak
[dns.git] / src / openstreetmap.js
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 4e1d6feca8be2cbcbd8f54cb961f90431cd79f90..3f7e433b6a4693a531c1f1f951ac503367dabfce 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -25,12 +25,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("community", 10, QUALIFY("a.mx")),
   MX("supporting", 10, QUALIFY("a.mx")),
 
   MX("community", 10, QUALIFY("a.mx")),
   MX("supporting", 10, QUALIFY("a.mx")),
 
-  A("a.mx", FAFNIR_IPV4),
-  AAAA("a.mx", FAFNIR_IPV6),
-  A("mail", FAFNIR_IPV4),
-  AAAA("mail", FAFNIR_IPV6),
-  A("mta-sts", FAFNIR_IPV4),
-  AAAA("mta-sts", FAFNIR_IPV6),
+  A("a.mx", IPV4["fafnir.he"]),
+  AAAA("a.mx", IPV6["fafnir.he"]),
+  A("mail", IPV4["fafnir.he"]),
+  AAAA("mail", IPV6["fafnir.he"]),
+  A("mta-sts", IPV4["fafnir.he"]),
+  AAAA("mta-sts", IPV6["fafnir.he"]),
 
   // Publish SPF records indicating that only shenron sends mail
 
 
   // Publish SPF records indicating that only shenron sends mail
 
@@ -38,16 +38,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "@",
     parts: [
       "v=spf1",
     label: "@",
     parts: [
       "v=spf1",
-      "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
-      "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
-      "mx",                       // safety net if we change mx
+      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
+      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
+      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
+      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
+      "ip4:193.60.236.0/24",        // ucl external
+      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
+      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
+      "ip4:87.252.214.96/27",       // dublin external (equinix)
+      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
+      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
+      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
+      "ip4:184.104.226.96/27",      // dublin external (he.net)
+      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
+      "mx",                         // safety net if we change mx
       "-all"
     ]
   }),
       "-all"
     ]
   }),
@@ -56,16 +60,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "messages",
     parts: [
       "v=spf1",
     label: "messages",
     parts: [
       "v=spf1",
-      "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
-      "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
-      "mx",                       // safety net if we change mx
+      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
+      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
+      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
+      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
+      "ip4:193.60.236.0/24",        // ucl external
+      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
+      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
+      "ip4:87.252.214.96/27",       // dublin external (equinix)
+      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
+      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
+      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
+      "ip4:184.104.226.96/27",      // dublin external (he.net)
+      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
+      "mx",                         // safety net if we change mx
       "-all"
     ]
   }),
       "-all"
     ]
   }),
@@ -74,16 +82,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "noreply",
     parts: [
       "v=spf1",
     label: "noreply",
     parts: [
       "v=spf1",
-      "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
-      "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
-      "mx",                       // safety net if we change mx
+      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
+      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
+      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
+      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
+      "ip4:193.60.236.0/24",        // ucl external
+      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
+      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
+      "ip4:87.252.214.96/27",       // dublin external (equinix)
+      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
+      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
+      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
+      "ip4:184.104.226.96/27",      // dublin external (he.net)
+      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
+      "mx",                         // safety net if we change mx
       "-all"
     ]
   }),
       "-all"
     ]
   }),
@@ -92,16 +104,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "otrs",
     parts: [
       "v=spf1",
     label: "otrs",
     parts: [
       "v=spf1",
-      "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
-      "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
-      "mx",                       // safety net if we change mx
+      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
+      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
+      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
+      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
+      "ip4:193.60.236.0/24",        // ucl external
+      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
+      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
+      "ip4:87.252.214.96/27",       // dublin external (equinix)
+      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
+      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
+      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
+      "ip4:184.104.226.96/27",      // dublin external (he.net)
+      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
+      "mx",                         // safety net if we change mx
       "-all"
     ]
   }),
       "-all"
     ]
   }),
@@ -110,16 +126,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "community",
     parts: [
       "v=spf1",
     label: "community",
     parts: [
       "v=spf1",
-      "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
-      "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
-      "mx",                       // safety net if we change mx
+      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
+      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
+      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
+      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
+      "ip4:193.60.236.0/24",        // ucl external
+      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
+      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
+      "ip4:87.252.214.96/27",       // dublin external (equinix)
+      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
+      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
+      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
+      "ip4:184.104.226.96/27",      // dublin external (he.net)
+      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
+      "mx",                         // safety net if we change mx
       "-all"
     ]
   }),
       "-all"
     ]
   }),
@@ -128,16 +148,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "supporting",
     parts: [
       "v=spf1",
     label: "supporting",
     parts: [
       "v=spf1",
-      "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
-      "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
-      "mx",                       // safety net if we change mx
+      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
+      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
+      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
+      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
+      "ip4:193.60.236.0/24",        // ucl external
+      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
+      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
+      "ip4:87.252.214.96/27",       // dublin external (equinix)
+      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
+      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
+      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
+      "ip4:184.104.226.96/27",      // dublin external (he.net)
+      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
+      "mx",                         // safety net if we change mx
       "-all"
     ]
   }),
       "-all"
     ]
   }),
@@ -167,8 +191,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"),
 
   // Facebook Business domain verification
   TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"),
 
   // Facebook Business domain verification
+
   TXT("@", "facebook-domain-verification=j5hix5i8r0kortfugqf2p9wx9x9by0"),
 
   TXT("@", "facebook-domain-verification=j5hix5i8r0kortfugqf2p9wx9x9by0"),
 
+  // Bluesky domain verification
+
+  TXT("_atproto", "did=did:plc:i6llv7iwybeipknl57v4dalb"),
+
   // Delegate MTA-STS policy for subdomains
 
   CNAME("_mta-sts.messages", QUALIFY("_mta-sts")),
   // Delegate MTA-STS policy for subdomains
 
   CNAME("_mta-sts.messages", QUALIFY("_mta-sts")),
@@ -184,481 +213,352 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web servers and their aliases
 
 
   // Main web servers and their aliases
 
-  A("spike-01", SPIKE01_IPV4),
-  AAAA("spike-01", SPIKE01_IPV6),
-  // A("@", SPIKE01_IPV4),
-  // AAAA("@", SPIKE01_IPV6),
-  // A("www", SPIKE01_IPV4),
-  // AAAA("www", SPIKE01_IPV6),
-  // A("api", SPIKE01_IPV4),
-  // AAAA("api", SPIKE01_IPV6),
-  // A("maps", SPIKE01_IPV4),
-  // AAAA("maps", SPIKE01_IPV6),
-  // A("mapz", SPIKE01_IPV4),
-  // AAAA("mapz", SPIKE01_IPV6),
-  A("spike-01.dub", SPIKE01_INTERNAL),
-  A("spike-01.oob", SPIKE01_OOB),
-
-  A("spike-02", SPIKE02_IPV4),
-  AAAA("spike-02", SPIKE02_IPV6),
-  // A("@", SPIKE02_IPV4),
-  // AAAA("@", SPIKE02_IPV6),
-  // A("www", SPIKE02_IPV4),
-  // AAAA("www", SPIKE02_IPV6),
-  // A("api", SPIKE02_IPV4),
-  // AAAA("api", SPIKE02_IPV6),
-  // A("maps", SPIKE02_IPV4),
-  // AAAA("maps", SPIKE02_IPV6),
-  // A("mapz", SPIKE02_IPV4),
-  // AAAA("mapz", SPIKE02_IPV6),
-  A("spike-02.dub", SPIKE02_INTERNAL),
-  A("spike-02.oob", SPIKE02_OOB),
-
-  A("spike-03", SPIKE03_IPV4),
-  AAAA("spike-03", SPIKE03_IPV6),
-  // A("@", SPIKE03_IPV4),
-  // AAAA("@", SPIKE03_IPV6),
-  // A("www", SPIKE03_IPV4),
-  // AAAA("www", SPIKE03_IPV6),
-  // A("api", SPIKE03_IPV4),
-  // AAAA("api", SPIKE03_IPV6),
-  // A("maps", SPIKE03_IPV4),
-  // AAAA("maps", SPIKE03_IPV6),
-  // A("mapz", SPIKE03_IPV4),
-  // AAAA("mapz", SPIKE03_IPV6),
-  A("spike-03.dub", SPIKE03_INTERNAL),
-  A("spike-03.oob", SPIKE03_OOB),
-
-  A("spike-06", SPIKE06_IPV4),
-  AAAA("spike-06", SPIKE06_IPV6),
-  A("@", SPIKE06_IPV4),
-  AAAA("@", SPIKE06_IPV6),
-  A("www", SPIKE06_IPV4),
-  AAAA("www", SPIKE06_IPV6),
-  A("api", SPIKE06_IPV4),
-  AAAA("api", SPIKE06_IPV6),
-  A("maps", SPIKE06_IPV4),
-  AAAA("maps", SPIKE06_IPV6),
-  A("mapz", SPIKE06_IPV4),
-  AAAA("mapz", SPIKE06_IPV6),
-  A("spike-06.ams", SPIKE06_INTERNAL),
-  A("spike-06.oob", SPIKE06_OOB),
-
-  A("spike-07", SPIKE07_IPV4),
-  AAAA("spike-07", SPIKE07_IPV6),
-  A("@", SPIKE07_IPV4),
-  AAAA("@", SPIKE07_IPV6),
-  A("www", SPIKE07_IPV4),
-  AAAA("www", SPIKE07_IPV6),
-  A("api", SPIKE07_IPV4),
-  AAAA("api", SPIKE07_IPV6),
-  A("maps", SPIKE07_IPV4),
-  AAAA("maps", SPIKE07_IPV6),
-  A("mapz", SPIKE07_IPV4),
-  AAAA("mapz", SPIKE07_IPV6),
-  A("spike-07.ams", SPIKE07_INTERNAL),
-  A("spike-07.oob", SPIKE07_OOB),
-
-  A("spike-08", SPIKE08_IPV4),
-  AAAA("spike-08", SPIKE08_IPV6),
-  A("@", SPIKE08_IPV4),
-  AAAA("@", SPIKE08_IPV6),
-  A("www", SPIKE08_IPV4),
-  AAAA("www", SPIKE08_IPV6),
-  A("api", SPIKE08_IPV4),
-  AAAA("api", SPIKE08_IPV6),
-  A("maps", SPIKE08_IPV4),
-  AAAA("maps", SPIKE08_IPV6),
-  A("mapz", SPIKE08_IPV4),
-  AAAA("mapz", SPIKE08_IPV6),
-  A("spike-08.ams", SPIKE08_INTERNAL),
-  A("spike-08.oob", SPIKE08_OOB),
+  HTTPS("www", 1, ".", "alpn=h2"),
+  HTTPS("api", 1, ".", "alpn=h2"),
+  HTTPS("maps", 1, ".", "alpn=h2"),
+  HTTPS("mapz", 1, ".", "alpn=h2"),
+
+  // A("@", IPV4["spike-01.he"]),
+  // AAAA("@", IPV6["spike-01.he"]),
+  // A("www", IPV4["spike-01.he"]),
+  // AAAA("www", IPV6["spike-01.he"]),
+  // A("api", IPV4["spike-01.he"]),
+  // AAAA("api", IPV6["spike-01.he"]),
+  // A("maps", IPV4["spike-01.he"]),
+  // AAAA("maps", IPV6["spike-01.he"]),
+  // A("mapz", IPV4["spike-01.he"]),
+  // AAAA("mapz", IPV6["spike-01.he"]),
+
+  // A("@", IPV4["spike-02.he"]),
+  // AAAA("@", IPV6["spike-02.he"]),
+  // A("www", IPV4["spike-02.he"]),
+  // AAAA("www", IPV6["spike-02.he"]),
+  // A("api", IPV4["spike-02.he"]),
+  // AAAA("api", IPV6["spike-02.he"]),
+  // A("maps", IPV4["spike-02.he"]),
+  // AAAA("maps", IPV6["spike-02.he"]),
+  // A("mapz", IPV4["spike-02.he"]),
+  // AAAA("mapz", IPV6["spike-02.he"]),
+
+  // A("@", IPV4["spike-03.he"]),
+  // AAAA("@", IPV6["spike-03.he"]),
+  // A("www", IPV4["spike-03.he"]),
+  // AAAA("www", IPV6["spike-03.he"]),
+  // A("api", IPV4["spike-03.he"]),
+  // AAAA("api", IPV6["spike-03.he"]),
+  // A("maps", IPV4["spike-03.he"]),
+  // AAAA("maps", IPV6["spike-03.he"]),
+  // A("mapz", IPV4["spike-03.he"]),
+  // AAAA("mapz", IPV6["spike-03.he"]),
+
+  A("@", IPV4["spike-06"], CF_PROXY_ON),
+  AAAA("@", IPV6["spike-06"], CF_PROXY_ON),
+  A("www", IPV4["spike-06"], CF_PROXY_ON),
+  AAAA("www", IPV6["spike-06"], CF_PROXY_ON),
+  A("api", IPV4["spike-06"], CF_PROXY_ON),
+  AAAA("api", IPV6["spike-06"], CF_PROXY_ON),
+  A("maps", IPV4["spike-06"], CF_PROXY_ON),
+  AAAA("maps", IPV6["spike-06"], CF_PROXY_ON),
+  A("mapz", IPV4["spike-06"], CF_PROXY_ON),
+  AAAA("mapz", IPV6["spike-06"], CF_PROXY_ON),
+
+  A("@", IPV4["spike-07"], CF_PROXY_ON),
+  AAAA("@", IPV6["spike-07"], CF_PROXY_ON),
+  A("www", IPV4["spike-07"], CF_PROXY_ON),
+  AAAA("www", IPV6["spike-07"], CF_PROXY_ON),
+  A("api", IPV4["spike-07"], CF_PROXY_ON),
+  AAAA("api", IPV6["spike-07"], CF_PROXY_ON),
+  A("maps", IPV4["spike-07"], CF_PROXY_ON),
+  AAAA("maps", IPV6["spike-07"], CF_PROXY_ON),
+  A("mapz", IPV4["spike-07"], CF_PROXY_ON),
+  AAAA("mapz", IPV6["spike-07"], CF_PROXY_ON),
+
+  A("@", IPV4["spike-08"], CF_PROXY_ON),
+  AAAA("@", IPV6["spike-08"], CF_PROXY_ON),
+  A("www", IPV4["spike-08"], CF_PROXY_ON),
+  AAAA("www", IPV6["spike-08"], CF_PROXY_ON),
+  A("api", IPV4["spike-08"], CF_PROXY_ON),
+  AAAA("api", IPV6["spike-08"], CF_PROXY_ON),
+  A("maps", IPV4["spike-08"], CF_PROXY_ON),
+  AAAA("maps", IPV6["spike-08"], CF_PROXY_ON),
+  A("mapz", IPV4["spike-08"], CF_PROXY_ON),
+  AAAA("mapz", IPV6["spike-08"], CF_PROXY_ON),
 
   // Nominatim servers
 
 
   // Nominatim servers
 
-  A("dulcy", DULCY_IPV4),
-  AAAA("dulcy", DULCY_IPV6),
-  A("dulcy.ams", DULCY_INTERNAL),
-  A("dulcy.oob", DULCY_OOB),
-
-  A("longma", LONGMA_IPV4),
-  AAAA("longma", LONGMA_IPV6),
-  A("longma.dub", LONGMA_INTERNAL),
-  A("longma.oob", LONGMA_OOB),
-
-  A("stormfly-04", STORMFLY04_IPV4),
-  AAAA("stormfly-04", STORMFLY04_IPV6),
-  A("stormfly-04.oob", STORMFLY04_OOB),
-
-  A("vhagar", VHAGAR_IPV4),
-  AAAA("vhagar", VHAGAR_IPV6),
-  A("vhagar.ams", VHAGAR_INTERNAL),
-  A("vhagar.oob", VHAGAR_OOB),
-
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
 
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
 
-  // Taginfo server
-
-  A("dribble", DRIBBLE_IPV4),
-  A("taginfo", DRIBBLE_IPV4),
-  AAAA("dribble", DRIBBLE_IPV6),
-  AAAA("taginfo", DRIBBLE_IPV6),
-  A("dribble.ams", DRIBBLE_INTERNAL),
-  A("dribble.oob", DRIBBLE_OOB),
-
   // Tile servers
 
   // Tile servers
 
-  A("odin", ODIN_IPV4),
-  AAAA("odin", ODIN_IPV6),
-  A("odin.ams", ODIN_INTERNAL),
-  A("odin.oob", ODIN_OOB),
-
-  A("ysera", YSERA_IPV4),
-  A("ysera.ucl", YSERA_INTERNAL),
-  A("ysera.oob", YSERA_OOB),
-
-  A("culebre", CULEBRE_IPV4),
-  AAAA("culebre", CULEBRE_IPV6),
-  A("culebre.dub", CULEBRE_INTERNAL),
-  A("culebre.oob", CULEBRE_OOB),
-
-  A("nidhogg", NIDHOGG_IPV4),
-  AAAA("nidhogg", NIDHOGG_IPV6),
-  A("nidhogg.oob", NIDHOGG_OOB),
-
-  A("scorch", SCORCH_IPV4),
-  AAAA("scorch", SCORCH_IPV6),
-
-  A("rhaegal", RHAEGAL_IPV4),
-
-  A("palulukon", PALULUKON_IPV4),
-
-  A("piasa", PIASA_IPV4),
-  AAAA("piasa", PIASA_IPV6),
-  A("piasa.oob", PIASA_OOB),
-
-  A("bowser", BOWSER_IPV4),
-
-  A("balerion", BALERION_IPV4),
-
-  A("albi", ALBI_IPV4),
-  AAAA("albi", ALBI_IPV6),
-
-  A("necrosan", NECROSAN_IPV4),
-  AAAA("necrosan", NECROSAN_IPV6),
-
   CNAME("tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("a.tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("b.tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("c.tile", "dualstack.n.sni.global.fastly.net."),
 
   CNAME("tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("a.tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("b.tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("c.tile", "dualstack.n.sni.global.fastly.net."),
 
-  A("render", CULEBRE_IPV4),
-  A("render", NIDHOGG_IPV4),
-  AAAA("render", CULEBRE_IPV6),
-  AAAA("render", NIDHOGG_IPV6),
+  A("render", IPV4["culebre.he"]),
+  A("render", IPV4["nidhogg"]),
+  AAAA("render", IPV6["culebre.he"]),
+  AAAA("render", IPV6["nidhogg"]),
 
 
-  // Site gateways
+  // Vector tile servers
 
 
-  A("ironbelly", IRONBELLY_IPV4),
-  AAAA("ironbelly", IRONBELLY_IPV6),
-  A("logstash", IRONBELLY_IPV4),
-  AAAA("logstash", IRONBELLY_IPV6),
-  A("tiler", IRONBELLY_IPV4),
-  AAAA("tiler", IRONBELLY_IPV6),
-  A("ironbelly.ams", IRONBELLY_INTERNAL),
-  A("ironbelly.oob", IRONBELLY_OOB),
-
-  A("fafnir", FAFNIR_IPV4),
-  AAAA("fafnir", FAFNIR_IPV6),
-  A("fafnir.dub", FAFNIR_INTERNAL),
-  A("fafnir.oob", FAFNIR_OOB),
+  CNAME("vector", "dualstack.n.sni.global.fastly.net."),
 
   // Planet servers
 
 
   // Planet servers
 
-  A("norbert", NORBERT_IPV4),
-  AAAA("norbert", NORBERT_IPV6),
-  A("backup", NORBERT_IPV4),
-  AAAA("backup", NORBERT_IPV6),
-  A("planet", NORBERT_IPV4),
-  AAAA("planet", NORBERT_IPV6),
-  A("norbert.ams", NORBERT_INTERNAL),
-  A("norbert.oob", NORBERT_OOB),
-
-  A("horntail", HORNTAIL_IPV4),
-  AAAA("horntail", HORNTAIL_IPV6),
-  // A("backup", HORNTAIL_IPV4),
-  // AAAA("backup", HORNTAIL_IPV6),
-  // A("planet", HORNTAIL_IPV4),
-  // AAAA("planet", HORNTAIL_IPV6),
-  A("horntail.dub", HORNTAIL_INTERNAL),
-  A("horntail.oob", HORNTAIL_OOB),
-
-  // Database servers
+  HTTPS("planet", 1, ".", "alpn=h2"),
 
 
-  A("snap-01.ams", SNAP01_INTERNAL),
-  A("snap-01.oob", SNAP01_OOB),
+  A("backup", IPV4["norbert"]),
+  AAAA("backup", IPV6["norbert"]),
+  A("planet", IPV4["norbert"]),
+  AAAA("planet", IPV6["norbert"]),
 
 
-  A("snap-02.ucl", SNAP02_INTERNAL),
-  A("snap-02.oob", SNAP02_OOB),
-
-  A("snap-03.dub", SNAP03_INTERNAL),
-  A("snap-03.oob", SNAP03_OOB),
-
-  A("karm.ams", KARM_INTERNAL),
-  A("karm.oob", KARM_OOB),
-
-  A("eddie.ucl", EDDIE_INTERNAL),
-  A("eddie.oob", EDDIE_OOB),
+  // A("backup", IPV4["horntail.he"]),
+  // AAAA("backup", IPV6["horntail.he"]),
+  // A("planet", IPV4["horntail.he"]),
+  // AAAA("planet", IPV6["horntail.he"]),
 
   // Development server with wildcard alias for user sites
 
 
   // Development server with wildcard alias for user sites
 
-  A("faffy", FAFFY_IPV4),
-  AAAA("faffy", FAFFY_IPV6),
-  A("dev", FAFFY_IPV4),
-  AAAA("dev", FAFFY_IPV6),
-  A("*.dev", FAFFY_IPV4),
-  AAAA("*.dev", FAFFY_IPV6),
-  A("ooc", FAFFY_IPV4),
-  AAAA("ooc", FAFFY_IPV6),
-  A("a.ooc", FAFFY_IPV4),
-  AAAA("a.ooc", FAFFY_IPV6),
-  A("b.ooc", FAFFY_IPV4),
-  AAAA("b.ooc", FAFFY_IPV6),
-  A("c.ooc", FAFFY_IPV4),
-  AAAA("c.ooc", FAFFY_IPV6),
-  A("npe", FAFFY_IPV4),
-  AAAA("npe", FAFFY_IPV6),
-  A("faffy.ams", FAFFY_INTERNAL),
-  A("faffy.oob", FAFFY_OOB),
+  A("dev", IPV4["faffy"]),
+  AAAA("dev", IPV6["faffy"]),
+  A("*.dev", IPV4["faffy"]),
+  AAAA("*.dev", IPV6["faffy"]),
+  A("ooc", IPV4["faffy"]),
+  AAAA("ooc", IPV6["faffy"]),
+  A("a.ooc", IPV4["faffy"]),
+  AAAA("a.ooc", IPV6["faffy"]),
+  A("b.ooc", IPV4["faffy"]),
+  AAAA("b.ooc", IPV6["faffy"]),
+  A("c.ooc", IPV4["faffy"]),
+  AAAA("c.ooc", IPV6["faffy"]),
+  A("npe", IPV4["faffy"]),
+  AAAA("npe", IPV6["faffy"]),
 
   // Foundation server
 
 
   // Foundation server
 
-  A("ridley", RIDLEY_IPV4),
-  A("otrs", RIDLEY_IPV4),
-  A("blog", RIDLEY_IPV4),
-  A("foundation", RIDLEY_IPV4),
-  A("ridley.ucl", RIDLEY_INTERNAL),
-  A("ridley.oob", RIDLEY_OOB),
+  HTTPS("blog", 1, ".", "alpn=h2"),
+  HTTPS("foundation", 1, ".", "alpn=h2"),
+
+  A("blog", IPV4["ridley"]),
+  A("foundation", IPV4["ridley"]),
 
   // Matomo server
 
 
   // Matomo server
 
-  A("smaug", SMAUG_IPV4),
-  AAAA("smaug", SMAUG_IPV6),
-  A("matomo", SMAUG_IPV4),
-  AAAA("matomo", SMAUG_IPV6),
-  A("piwik", SMAUG_IPV4),
-  AAAA("piwik", SMAUG_IPV6),
-  A("smaug.dub", SMAUG_INTERNAL),
-  A("smaug.oob", SMAUG_OOB),
+  HTTPS("matomo", 1, ".", "alpn=h2"),
+  HTTPS("piwik", 1, ".", "alpn=h2"),
+
+  A("matomo", IPV4["smaug.he"]),
+  AAAA("matomo", IPV6["smaug.he"]),
+  A("piwik", IPV4["smaug.he"]),
+  AAAA("piwik", IPV6["smaug.he"]),
 
   // Imagery servers
 
 
   // Imagery servers
 
-  A("draco", DRACO_IPV4),
-  A("draco.ucl", DRACO_INTERNAL),
-  A("draco.oob", DRACO_OOB),
-
-  A("kessie", KESSIE_IPV4),
-  AAAA("kessie", KESSIE_IPV6),
-  A("agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("agri", KESSIE_IPV6, TTL("1h")),
-  A("a.agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.agri", KESSIE_IPV6, TTL("1h")),
-  A("b.agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.agri", KESSIE_IPV6, TTL("1h")),
-  A("c.agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.agri", KESSIE_IPV6, TTL("1h")),
-  A("os", KESSIE_IPV4, TTL("1h")),
-  AAAA("os", KESSIE_IPV6, TTL("1h")),
-  A("a.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.os", KESSIE_IPV6, TTL("1h")),
-  A("b.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.os", KESSIE_IPV6, TTL("1h")),
-  A("c.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.os", KESSIE_IPV6, TTL("1h")),
-  A("kessie.oob", KESSIE_OOB),
-
-  // Prometheus server
-
-  A("stormfly-03", STORMFLY03_IPV4),
-  AAAA("stormfly-03", STORMFLY03_IPV6),
-  A("prometheus", STORMFLY03_IPV4),
-  AAAA("prometheus", STORMFLY03_IPV6),
-  A("stormfly-03.oob", STORMFLY03_OOB),
+  HTTPS("agri", 1, ".", "alpn=h2"),
+  HTTPS("a.agri", 1, ".", "alpn=h2"),
+  HTTPS("b.agri", 1, ".", "alpn=h2"),
+  HTTPS("c.agri", 1, ".", "alpn=h2"),
+
+  A("agri", IPV4["lockheed"]),
+  AAAA("agri", IPV6["lockheed"]),
+  A("a.agri", IPV4["lockheed"]),
+  AAAA("a.agri", IPV6["lockheed"]),
+  A("b.agri", IPV4["lockheed"]),
+  AAAA("b.agri", IPV6["lockheed"]),
+  A("c.agri", IPV4["lockheed"]),
+  AAAA("c.agri", IPV6["lockheed"]),
+
+  HTTPS("os", 1, ".", "alpn=h2"),
+  HTTPS("a.os", 1, ".", "alpn=h2"),
+  HTTPS("b.os", 1, ".", "alpn=h2"),
+  HTTPS("c.os", 1, ".", "alpn=h2"),
+
+  A("os", IPV4["lockheed"]),
+  AAAA("os", IPV6["lockheed"]),
+  A("a.os", IPV4["lockheed"]),
+  AAAA("a.os", IPV6["lockheed"]),
+  A("b.os", IPV4["lockheed"]),
+  AAAA("b.os", IPV6["lockheed"]),
+  A("c.os", IPV4["lockheed"]),
+  AAAA("c.os", IPV6["lockheed"]),
+
+  HTTPS("tiler", 1, ".", "alpn=h2"),
+  HTTPS("us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("a.us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("b.us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("c.us-imagery", 1, ".", "alpn=h2"),
+
+  A("tiler", IPV4["lockheed"]),
+  AAAA("tiler", IPV6["lockheed"]),
+  A("us-imagery", IPV4["lockheed"]),
+  AAAA("us-imagery", IPV6["lockheed"]),
+  A("a.us-imagery", IPV4["lockheed"]),
+  AAAA("a.us-imagery", IPV6["lockheed"]),
+  A("b.us-imagery", IPV4["lockheed"]),
+  AAAA("b.us-imagery", IPV6["lockheed"]),
+  A("c.us-imagery", IPV4["lockheed"]),
+  AAAA("c.us-imagery", IPV6["lockheed"]),
+
+  // Prometheus server and munin redirect
+
+  HTTPS("prometheus", 1, ".", "alpn=h2"),
+  HTTPS("munin", 1, ".", "alpn=h2"),
+
+  A("prometheus", IPV4["stormfly-03"]),
+  AAAA("prometheus", IPV6["stormfly-03"]),
+  A("munin", IPV4["stormfly-03"]),
+  AAAA("munin", IPV6["stormfly-03"]),
 
   // Management server
 
 
   // Management server
 
-  A("idris", IDRIS_IPV4),
-  AAAA("idris", IDRIS_IPV6),
-  A("acme", IDRIS_IPV4),
-  AAAA("acme", IDRIS_IPV6),
-  A("chef", IDRIS_IPV4),
-  AAAA("chef", IDRIS_IPV6),
-  A("dns", IDRIS_IPV4),
-  AAAA("dns", IDRIS_IPV6),
-  A("git", IDRIS_IPV4),
-  AAAA("git", IDRIS_IPV6),
-  A("hardware", IDRIS_IPV4),
-  AAAA("hardware", IDRIS_IPV6),
-  A("idris.dub", IDRIS_INTERNAL),
-  A("idris.oob", IDRIS_OOB),
-
-  // KVMs
+  HTTPS("acme", 1, ".", "alpn=h2"),
+  HTTPS("chef", 1, ".", "alpn=h2"),
+  HTTPS("dns", 1, ".", "alpn=h2"),
+  HTTPS("git", 1, ".", "alpn=h2"),
+  HTTPS("hardware", 1, ".", "alpn=h2"),
+
+  A("acme", IPV4["idris.he"]),
+  AAAA("acme", IPV6["idris.he"]),
+  A("apt", IPV4["idris.he"]),
+  AAAA("apt", IPV6["idris.he"]),
+  A("chef", IPV4["idris.he"]),
+  AAAA("chef", IPV6["idris.he"]),
+  A("dns", IPV4["idris.he"]),
+  AAAA("dns", IPV6["idris.he"]),
+  A("git", IPV4["idris.he"]),
+  AAAA("git", IPV6["idris.he"]),
+  A("hardware", IPV4["idris.he"]),
+  AAAA("hardware", IPV6["idris.he"]),
 
 
-  A("kvm1.ucl", KVM1_INTERNAL),
-
-  // Managed network switches
-
-  A("switch1.ams", SWITCH1AMS_IPV4),
-  AAAA("switch1.ams", SWITCH1AMS_IPV6),
-
-  A("switch1.dub", SWITCH1DUB_IPV4),
-  AAAA("switch1.dub", SWITCH1DUB_IPV6),
-
-  // Managed power strips
+  // Bytemark machine, and the services which operate from it
 
 
-  A("pdu1.ams", PDU1AMS_INTERNAL),
-  A("pdu2.ams", PDU2AMS_INTERNAL),
+  HTTPS("lists", 1, ".", "alpn=h2"),
+  HTTPS("help", 1, ".", "alpn=h2"),
+
+  A("lists", IPV4["shenron"]),
+  AAAA("lists", IPV6["shenron"]),
+  A("help", IPV4["shenron"]),
+  AAAA("help", IPV6["shenron"]),
+
+  // Naga services
+
+  HTTPS("svn", 1, ".", "alpn=h2"),
+  HTTPS("trac", 1, ".", "alpn=h2"),
+  HTTPS("irc", 1, ".", "alpn=h2"),
+  HTTPS("blogs", 1, ".", "alpn=h2"),
+  HTTPS("welcome", 1, ".", "alpn=h2"),
+  HTTPS("operations", 1, ".", "alpn=h2"),
+  HTTPS("hot", 1, ".", "alpn=h2"),
+  HTTPS("dmca", 1, ".", "alpn=h2"),
+  // HTTPS("otrs", 1, ".", "alpn=h2"), - OTRS is not available using HTTPS/2
+  HTTPS("birthday20", 1, ".", "alpn=h2"),
+
+  A("svn", IPV4["naga.he"]),
+  AAAA("svn", IPV6["naga.he"]),
+  A("trac", IPV4["naga.he"]),
+  AAAA("trac", IPV6["naga.he"]),
+  A("irc", IPV4["naga.he"]),
+  AAAA("irc", IPV6["naga.he"]),
+  A("blogs", IPV4["naga.he"]),
+  AAAA("blogs", IPV6["naga.he"]),
+  A("welcome", IPV4["naga.he"]),
+  AAAA("welcome", IPV6["naga.he"]),
+  A("operations", IPV4["naga.he"]),
+  AAAA("operations", IPV6["naga.he"]),
+  A("hot", IPV4["naga.he"]),
+  AAAA("hot", IPV6["naga.he"]),
+  A("dmca", IPV4["naga.he"]),
+  AAAA("dmca", IPV6["naga.he"]),
+  A("otrs", IPV4["naga.he"]),
+  AAAA("otrs", IPV6["naga.he"]),
+  A("birthday20", IPV4["naga.he"]),
+  AAAA("birthday20", IPV6["naga.he"]),
 
 
-  A("pdu1.dub", PDU1DUB_INTERNAL),
-  A("pdu2.dub", PDU2DUB_INTERNAL),
+  // Wiki servers
 
 
-  // Out of band access servers
+  HTTPS("wiki", 1, ".", "alpn=h2"),
 
 
-  A("oob1.ams", OOB1AMS_INTERNAL),
+  A("wiki", IPV4["konqi.he"]),
+  AAAA("wiki", IPV6["konqi.he"]),
 
 
-  A("oob1.dub", OOB1DUB_INTERNAL),
+  // Overpass server
 
 
-  // Bytemark machine, and the services which operate from it
+  HTTPS("query", 1, ".", "alpn=h2"),
 
 
-  A("shenron", SHENRON_IPV4),
-  AAAA("shenron", SHENRON_IPV6),
-  A("lists", SHENRON_IPV4),
-  AAAA("lists", SHENRON_IPV6),
-  A("help", SHENRON_IPV4),
-  AAAA("help", SHENRON_IPV6),
-
-  // Naga service
-
-  A("naga", NAGA_IPV4),
-  AAAA("naga", NAGA_IPV6),
-  A("svn", NAGA_IPV4),
-  AAAA("svn", NAGA_IPV6),
-  A("trac", NAGA_IPV4),
-  AAAA("trac", NAGA_IPV6),
-  A("irc", NAGA_IPV4),
-  AAAA("irc", NAGA_IPV6),
-  A("blogs", NAGA_IPV4),
-  AAAA("blogs", NAGA_IPV6),
-  A("munin", NAGA_IPV4),
-  AAAA("munin", NAGA_IPV6),
-  A("welcome", NAGA_IPV4),
-  AAAA("welcome", NAGA_IPV6),
-  A("operations", NAGA_IPV4),
-  AAAA("operations", NAGA_IPV6),
-  A("hot", NAGA_IPV4),
-  AAAA("hot", NAGA_IPV6),
-  A("dmca", NAGA_IPV4),
-  AAAA("dmca", NAGA_IPV6),
-  A("naga.dub", NAGA_INTERNAL),
-  A("naga.oob", NAGA_OOB),
+  A("query", IPV4["grisu.he"]),
+  AAAA("query", IPV6["grisu.he"]),
 
 
-  // Wiki servers
+  // GPS tile server
 
 
-  A("konqi", KONQI_IPV4),
-  AAAA("konqi", KONQI_IPV6),
-  A("wiki", KONQI_IPV4),
-  AAAA("wiki", KONQI_IPV6),
-  A("konqi.dub", KONQI_INTERNAL),
-  A("konqi.oob", KONQI_OOB),
+  HTTPS("gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("a.gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("b.gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("c.gps-tile", 1, ".", "alpn=h2"),
+  HTTPS("gps-a.tile", 1, ".", "alpn=h2"),
+  HTTPS("gps-b.tile", 1, ".", "alpn=h2"),
+  HTTPS("gps-c.tile", 1, ".", "alpn=h2"),
+
+  A("gps-tile", IPV4["muirdris.he"]),
+  AAAA("gps-tile", IPV6["muirdris.he"]),
+  A("a.gps-tile", IPV4["muirdris.he"]),
+  AAAA("a.gps-tile", IPV6["muirdris.he"]),
+  A("b.gps-tile", IPV4["muirdris.he"]),
+  AAAA("b.gps-tile", IPV6["muirdris.he"]),
+  A("c.gps-tile", IPV4["muirdris.he"]),
+  AAAA("c.gps-tile", IPV6["muirdris.he"]),
+  A("gps.tile", IPV4["muirdris.he"]),
+  AAAA("gps.tile", IPV6["muirdris.he"]),
+  A("gps-a.tile", IPV4["muirdris.he"]),
+  AAAA("gps-a.tile", IPV6["muirdris.he"]),
+  A("gps-b.tile", IPV4["muirdris.he"]),
+  AAAA("gps-b.tile", IPV6["muirdris.he"]),
+  A("gps-c.tile", IPV4["muirdris.he"]),
+  AAAA("gps-c.tile", IPV6["muirdris.he"]),
 
 
-  // Overpass server
+  // Donation site and new OSMF crm site
 
 
-  A("grisu", GRISU_IPV4),
-  AAAA("grisu", GRISU_IPV6),
-  A("query", GRISU_IPV4),
-  AAAA("query", GRISU_IPV6),
-  A("grisu.dub", GRISU_INTERNAL),
-  A("grisu.oob", GRISU_OOB),
+  HTTPS("donate", 1, ".", "alpn=h2"),
+  HTTPS("support", 1, ".", "alpn=h2"),
+  HTTPS("supporting", 1, ".", "alpn=h2"),
 
 
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
-  A("gorwen.dub", GORWEN_INTERNAL),
-  A("gorwen.oob", GORWEN_OOB),
+  A("donate", IPV4["ridley"]),
+  A("support", IPV4["ridley"]),
+  A("supporting", IPV4["ridley"]),
 
 
-  // GPS tile server
+  // Discourse server ("community")
 
 
-  A("muirdris", MUIRDRIS_IPV4),
-  AAAA("muirdris", MUIRDRIS_IPV6),
-  A("gps-tile", MUIRDRIS_IPV4),
-  AAAA("gps-tile", MUIRDRIS_IPV6),
-  A("a.gps-tile", MUIRDRIS_IPV4),
-  AAAA("a.gps-tile", MUIRDRIS_IPV6),
-  A("b.gps-tile", MUIRDRIS_IPV4),
-  AAAA("b.gps-tile", MUIRDRIS_IPV6),
-  A("c.gps-tile", MUIRDRIS_IPV4),
-  AAAA("c.gps-tile", MUIRDRIS_IPV6),
-  A("gps.tile", MUIRDRIS_IPV4),
-  AAAA("gps.tile", MUIRDRIS_IPV6),
-  A("gps-a.tile", MUIRDRIS_IPV4),
-  AAAA("gps-a.tile", MUIRDRIS_IPV6),
-  A("gps-b.tile", MUIRDRIS_IPV4),
-  AAAA("gps-b.tile", MUIRDRIS_IPV6),
-  A("gps-c.tile", MUIRDRIS_IPV4),
-  AAAA("gps-c.tile", MUIRDRIS_IPV6),
-  A("muirdris.dub", MUIRDRIS_INTERNAL),
-  A("muirdris.oob", MUIRDRIS_OOB),
-
-  // Tile cache servers
-
-  A("ridgeback", RIDGEBACK_IPV4),
-  A("ridgeback.oob", RIDGEBACK_OOB),
-  A("angor", ANGOR_IPV4),
-  AAAA("angor", ANGOR_IPV6),
-  A("ladon", LADON_IPV4),
-  AAAA("ladon", LADON_IPV6),
-  A("ascalon", ASCALON_IPV4),
-  A("neak", NEAK_IPV4),
-  A("meraxes", MERAXES_IPV4),
-  AAAA("meraxes", MERAXES_IPV6),
+  HTTPS("community", 1, ".", "alpn=h2"),
+  HTTPS("communities", 1, ".", "alpn=h2"),
+  HTTPS("c", 1, ".", "alpn=h2"),
 
 
-  // Discourse server ("community")
+  A("community", IPV4["fume.he"]),
+  A("communities", IPV4["fume.he"]),
+  A("c", IPV4["fume.he"]),
+  AAAA("community", IPV6["fume.he"]),
+  AAAA("communities", IPV6["fume.he"]),
+  AAAA("c", IPV6["fume.he"]),
 
 
-  A("jakelong", JAKELONG_IPV4),
-  AAAA("jakelong", JAKELONG_IPV6),
-  A("community", JAKELONG_IPV4),
-  A("communities", JAKELONG_IPV4),
-  A("c", JAKELONG_IPV4),
-  AAAA("community", JAKELONG_IPV6),
-  AAAA("communities", JAKELONG_IPV6),
-  AAAA("c", JAKELONG_IPV6),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
-  A("forum", JAKELONG_IPV4),
-  AAAA("forum", JAKELONG_IPV6),
-  A("jakelong.dub", JAKELONG_INTERNAL),
-  A("jakelong.oob", JAKELONG_OOB),
-
-  // Donation site and new OSMF crm site
 
 
-  A("donate", RIDLEY_IPV4),
-  A("support", RIDLEY_IPV4),
-  A("supporting", RIDLEY_IPV4),
+  HTTPS("forum", 1, ".", "alpn=h2"),
 
 
-  // Spare servers
+  A("forum", IPV4["fume.he"]),
+  AAAA("forum", IPV6["fume.he"]),
 
 
-  A("fume", FUME_IPV4),
-  AAAA("fume", FUME_IPV6),
-  A("fume.dub", FUME_INTERNAL),
-  A("fume.oob", FUME_OOB),
+  // Taginfo and Staging Blog Server
 
 
-  // Uptime site at StatusCake
+  HTTPS("taginfo", 1, ".", "alpn=h2"),
 
 
-  CNAME("uptime", "uptimessl-new.statuscake.com."),
+  A("taginfo", IPV4["tabaluga"]),
+  AAAA("taginfo", IPV6["tabaluga"]),
 
 
-  // Dynamic DNS records
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
 
 
-  DYNAMIC_RECORDS
+  A("staging.blog", IPV4["tabaluga"]),
+  AAAA("staging.blog", IPV6["tabaluga"])
 
 );
 
 );
OpenStreetMap DNS