]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
Update dnscontrol link in README.md
[dns.git] / src / openstreetmap.js
index 90c1a1d427b25d542920711da4c715af56d367af..45df0a0e36819dbb36359d5f512db7f46e9e70ae 100644 (file)
 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"),
-
-  // Use shenron as the MX host
+  // Publish CAA records indicating that only letsencrypt and globalsign (Fastly) should issue certificates
+
+  CAA_BUILDER({
+    label: "@",
+    ttl: "1h",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+      "globalsign.com",   // Used by Fastly for CDN certificates
+    ],
+    issuewild: [
+      "letsencrypt.org",
+      "globalsign.com",   // Used by Fastly for CDN certificates
+    ],
+  }),
+
+  // Mail service
 
   MX("@", 10, QUALIFY("a.mx")),
   MX("messages", 10, QUALIFY("a.mx")),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),
-  A("a.mx", "212.110.172.32"),
-  AAAA("a.mx", "2001:41c9:1:400::32"),
+  MX("community", 10, QUALIFY("a.mx")),
+  MX("supporting", 10, QUALIFY("a.mx")),
+
+  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
 
-  TXT("@", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all"),
-  TXT("otrs", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all"),
+  SPF_BUILDER({
+    label: "@",
+    parts: [
+      "v=spf1",
+      "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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "messages",
+    parts: [
+      "v=spf1",
+      "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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "noreply",
+    parts: [
+      "v=spf1",
+      "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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "otrs",
+    parts: [
+      "v=spf1",
+      "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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "community",
+    parts: [
+      "v=spf1",
+      "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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "supporting",
+    parts: [
+      "v=spf1",
+      "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"
+    ]
+  }),
+
+  // Publish DKIM public key
+
+  TXT("20200301._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzvoNZVOGfw1V4A171hxHMhzVTAnIUQVJ8iX3wbqCld8A5iIaXeTGYvBmewymax/cYJS4QqzbpUzkgrrTA9avuZhd+QGJDgjADgx4VyMOaOS6FwAxS0uXtLrt+lsixRDx/feKyZHaxjzJAQy46ok77xXL4UXIaaovw6G6eZpIScMzZQ2zkKNJxTICzzSOduIilHhMWte4XP+/2PdRmD7Ge9jb0U4bZjswX0AqKSGzDKYw+yxVna9l53adeCnklqg2ofoXu+ResiH+kt05aCUOMo8en3em6yBnRCMalgi1E3Tt7I5BWcYFRkT/8agUGW4gGC6XMV9IskOsYL0emG0kGwIDAQAB", AUTOSPLIT),
+
+  // Publish DMARC report-only policy
+
+  DMARC_BUILDER({
+    policy: "none",
+    rua: [
+      "mailto:openstreetmap-d@dmarc.report-uri.com"
+    ],
+    failureOptions: 1
+  }),
 
   // Announce MTA-STS policy and TLSRPT policy for error reports
 
   TXT("_mta-sts", "v=STSv1; id=202001291805Z"),
-  TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:postmaster@openstreetmap.org"),
+  TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:openstreetmap-d@tlsrpt.report-uri.com"),
+
+  // Fastly cert domain ownership confirmation
+
+  TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"),
+  TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"),
+
+  // Facebook Business domain verification
+
+  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")),
   CNAME("_mta-sts.noreply", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.otrs", QUALIFY("_mta-sts")),
+  CNAME("_mta-sts.community", QUALIFY("_mta-sts")),
+  CNAME("_mta-sts.supporting", QUALIFY("_mta-sts")),
 
   // Google postmaster tools verification
 
   CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."),
   CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."),
 
-  // Delegate geo.openstreetmap.org to PowerDNS
-
-  NS("geo", QUALIFY("saphira")),
-  NS("geo", QUALIFY("ridgeback")),
-  NS("geo", QUALIFY("jakelong")),
-  NS("geo", QUALIFY("katie")),
-  NS("geo", QUALIFY("stormfly-02")),
-  NS("geo", QUALIFY("chrysophylax")),
-
   // Main web servers and their aliases
 
-  A("spike-04", "89.16.162.21"),
-  AAAA("spike-04", "2001:41c9:2:d6::21"),
-  // A("@", "89.16.162.21", TTL("10m")),
-  // AAAA("@", "2001:41c9:2:d6::21", TTL("10m")),
-  // A("www", "89.16.162.21", TTL("10m")),
-  // AAAA("www", "2001:41c9:2:d6::21", TTL("10m")),
-  // A("api", "89.16.162.21", TTL("10m")),
-  // AAAA("api", "2001:41c9:2:d6::21", TTL("10m")),
-  // A("maps", "89.16.162.21", TTL("10m")),
-  // AAAA("maps", "2001:41c9:2:d6::21", TTL("10m")),
-  // A("mapz", "89.16.162.21", TTL("10m")),
-  // AAAA("mapz", "2001:41c9:2:d6::21", TTL("10m")),
-  A("spike-04.bm", "10.0.32.21"),
-  A("spike-04.oob", "10.0.33.21"),
-
-  A("spike-05", "89.16.162.22"),
-  AAAA("spike-05", "2001:41c9:2:d6::22"),
-  // A("@", "89.16.162.22", TTL("10m")),
-  // AAAA("@", "2001:41c9:2:d6::22", TTL("10m")),
-  // A("www", "89.16.162.22", TTL("10m")),
-  // AAAA("www", "2001:41c9:2:d6::22", TTL("10m")),
-  // A("api", "89.16.162.22", TTL("10m")),
-  // AAAA("api", "2001:41c9:2:d6::22", TTL("10m")),
-  // A("maps", "89.16.162.22", TTL("10m")),
-  // AAAA("maps", "2001:41c9:2:d6::22", TTL("10m")),
-  // A("mapz", "89.16.162.22", TTL("10m")),
-  // AAAA("mapz", "2001:41c9:2:d6::22", TTL("10m")),
-  A("spike-05.bm", "10.0.32.22"),
-  A("spike-05.oob", "10.0.33.22"),
-
-  A("spike-06", "130.117.76.11"),
-  AAAA("spike-06", "2001:978:2:2c::172:B"),
-  A("@", "130.117.76.11", TTL("10m")),
-  AAAA("@", "2001:978:2:2c::172:B", TTL("10m")),
-  A("www", "130.117.76.11", TTL("10m")),
-  AAAA("www", "2001:978:2:2c::172:B", TTL("10m")),
-  A("api", "130.117.76.11", TTL("10m")),
-  AAAA("api", "2001:978:2:2c::172:B", TTL("10m")),
-  A("maps", "130.117.76.11", TTL("10m")),
-  AAAA("maps", "2001:978:2:2c::172:B", TTL("10m")),
-  A("mapz", "130.117.76.11", TTL("10m")),
-  AAAA("mapz", "2001:978:2:2c::172:B", TTL("10m")),
-  A("spike-06.ams", "10.0.48.11"),
-  A("spike-06.oob", "10.0.49.11"),
-
-  A("spike-07", "130.117.76.12"),
-  AAAA("spike-07", "2001:978:2:2c::172:C"),
-  A("@", "130.117.76.12", TTL("10m")),
-  AAAA("@", "2001:978:2:2c::172:C", TTL("10m")),
-  A("www", "130.117.76.12", TTL("10m")),
-  AAAA("www", "2001:978:2:2c::172:C", TTL("10m")),
-  A("api", "130.117.76.12", TTL("10m")),
-  AAAA("api", "2001:978:2:2c::172:C", TTL("10m")),
-  A("maps", "130.117.76.12", TTL("10m")),
-  AAAA("maps", "2001:978:2:2c::172:C", TTL("10m")),
-  A("mapz", "130.117.76.12", TTL("10m")),
-  AAAA("mapz", "2001:978:2:2c::172:C", TTL("10m")),
-  A("spike-07.ams", "10.0.48.12"),
-  A("spike-07.oob", "10.0.49.12"),
-
-  A("spike-08", "130.117.76.13"),
-  AAAA("spike-08", "2001:978:2:2c::172:D"),
-  A("@", "130.117.76.13", TTL("10m")),
-  AAAA("@", "2001:978:2:2c::172:D", TTL("10m")),
-  A("www", "130.117.76.13", TTL("10m")),
-  AAAA("www", "2001:978:2:2c::172:D", TTL("10m")),
-  A("api", "130.117.76.13", TTL("10m")),
-  AAAA("api", "2001:978:2:2c::172:D", TTL("10m")),
-  A("maps", "130.117.76.13", TTL("10m")),
-  AAAA("maps", "2001:978:2:2c::172:D", TTL("10m")),
-  A("mapz", "130.117.76.13", TTL("10m")),
-  AAAA("mapz", "2001:978:2:2c::172:D", TTL("10m")),
-  A("spike-08.ams", "10.0.48.13"),
-  A("spike-08.oob", "10.0.49.13"),
-
-  // Rails application servers
-
-  A("thorn-01.ams", "10.0.48.51"),
-  A("rails1.ams", "10.0.48.51"),
-  A("thorn-01.oob", "10.0.49.51"),
-
-  A("thorn-02.ams", "10.0.48.52"),
-  A("rails2.ams", "10.0.48.52"),
-  A("thorn-02.oob", "10.0.49.52"),
-
-  A("thorn-03.ams", "10.0.48.53"),
-  A("rails3.ams", "10.0.48.53"),
-  A("thorn-03.oob", "10.0.49.53"),
-
-  A("thorn-04.bm", "10.0.32.41"),
-  A("rails4.bm", "10.0.32.41"),
-  A("thorn-04.oob", "10.0.33.41"),
-
-  A("thorn-05.bm", "10.0.32.42"),
-  A("rails5.bm", "10.0.32.42"),
-  A("thorn-05.oob", "10.0.33.42"),
+  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
 
-  A("pummelzacken", "193.60.236.18"),
-  // A("nominatim", "193.60.236.18", TTL("10m")),
-  A("pummelzacken.ucl", "10.0.0.20"),
-  A("pummelzacken.oob", "10.0.1.20"),
+  CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
+  CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
+  CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
+
+  // Tile servers
 
-  A("dulcy", "130.117.76.9"),
-  AAAA("dulcy", "2001:978:2:2c::172:9"),
-  A("nominatim", "130.117.76.9", TTL("10m")),
-  AAAA("nominatim", "2001:978:2:2c::172:9", TTL("10m")),
-  A("dulcy.ams", "10.0.48.9"),
-  A("dulcy.oob", "10.0.49.9"),
+  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."),
 
-  // Taginfo server
+  A("render", IPV4["culebre.he"]),
+  A("render", IPV4["nidhogg"]),
+  AAAA("render", IPV6["culebre.he"]),
+  AAAA("render", IPV6["nidhogg"]),
 
-  A("grindtooth", "193.60.236.15"),
-  A("taginfo", "193.60.236.15", TTL("10m")),
-  A("grindtooth.ucl", "10.0.0.19"),
-  A("grindtooth.oob", "10.0.1.19"),
+  // Vector tile servers
 
-  A("stormfly-01", "140.211.167.104"),
-  AAAA("stormfly-01", "2605:bc80:3010:700::8cde:a768"),
-  // A("taginfo", "140.211.167.104", TTL("10m")),
-  // AAAA("taginfo", "2605:bc80:3010:700::8cde:a768", TTL("10m")),
-  A("stormfly-01.oob", "10.0.0.99"),
+  CNAME("vector", "dualstack.n.sni.global.fastly.net."),
 
-  // Tile servers
+  // Planet servers
+
+  HTTPS("planet", 1, ".", "alpn=h2"),
+
+  A("backup", IPV4["norbert"]),
+  AAAA("backup", IPV6["norbert"]),
+  A("planet", IPV4["norbert"]),
+  AAAA("planet", IPV6["norbert"]),
 
-  A("orm", "130.117.76.3"),
-  AAAA("orm", "2001:978:2:2c::172:3"),
-  A("orm.ams", "10.0.48.3"),
-  A("orm.oob", "10.0.49.3"),
+  // A("backup", IPV4["horntail.he"]),
+  // AAAA("backup", IPV6["horntail.he"]),
+  // A("planet", IPV4["horntail.he"]),
+  // AAAA("planet", IPV6["horntail.he"]),
 
-  A("odin", "130.117.76.15"),
-  AAAA("odin", "2001:978:2:2c::172:f"),
-  A("odin.ams", "10.0.48.15"),
-  A("odin.oob", "10.0.49.15"),
+  // Development server with wildcard alias for user sites
+
+  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"]),
 
-  A("ysera", "193.60.236.22"),
-  A("ysera.ucl", "10.0.0.15"),
-  A("ysera.oob", "10.0.1.15"),
+  // Foundation server
 
-  A("scorch", "176.31.235.79"),
-  AAAA("scorch", "2001:41d0:2:fc4f::1"),
+  HTTPS("blog", 1, ".", "alpn=h2"),
+  HTTPS("foundation", 1, ".", "alpn=h2"),
 
-  A("rhaegal", "161.53.248.77"),
+  A("blog", IPV4["ridley"]),
+  A("foundation", IPV4["ridley"]),
 
-  A("pyrene", "140.211.167.98"),
-  AAAA("pyrene", "2605:bc80:3010:700::8cd3:a762"),
-  A("pyrene.oob", "10.0.0.40"),
+  // Matomo server
 
-  A("bowser", "138.44.68.106"),
+  HTTPS("matomo", 1, ".", "alpn=h2"),
+  HTTPS("piwik", 1, ".", "alpn=h2"),
 
-  CNAME("tile", QUALIFY("tile.geo")),
-  CNAME("a.tile", QUALIFY("tile.geo")),
-  CNAME("b.tile", QUALIFY("tile.geo")),
-  CNAME("c.tile", QUALIFY("tile.geo")),
+  A("matomo", IPV4["smaug.he"]),
+  AAAA("matomo", IPV6["smaug.he"]),
+  A("piwik", IPV4["smaug.he"]),
+  AAAA("piwik", IPV6["smaug.he"]),
 
-  // Services machine
+  // Imagery servers
 
-  A("ironbelly", "130.117.76.10"),
-  AAAA("ironbelly", "2001:978:2:2c::172:a"),
-  A("backup", "130.117.76.10", TTL("10m")),
-  AAAA("backup", "2001:978:2:2c::172:a", TTL("10m")),
-  A("planet", "130.117.76.10", TTL("10m")),
-  AAAA("planet", "2001:978:2:2c::172:a", TTL("10m")),
-  A("logstash", "130.117.76.10"),
-  AAAA("logstash", "2001:978:2:2c::172:a"),
-  A("ironbelly.ams", "10.0.48.10"),
-  A("ironbelly.oob", "10.0.49.10"),
+  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
+
+  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("grisu", "89.16.162.20"),
-  AAAA("grisu", "2001:41c9:2:d6::20"),
-  // A("backup", "89.16.162.20", TTL("10m")),
-  // AAAA("backup", "2001:41c9:2:d6::20", TTL("10m")),
-  // A("planet", "89.16.162.20", TTL("10m")),
-  // AAAA("planet", "2001:41c9:2:d6::20", TTL("10m")),
-  A("grisu.bm", "10.0.32.20"),
-  A("grisu.oob", "10.0.33.20"),
+  // Bytemark machine, and the services which operate from it
 
-  // Database servers
+  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("karm.ams", "10.0.48.50"),
-  A("karm.oob", "10.0.49.50"),
+  // Wiki servers
 
-  A("eddie.ucl", "10.0.0.10"),
-  A("eddie.oob", "10.0.1.10"),
+  HTTPS("wiki", 1, ".", "alpn=h2"),
 
-  A("katla.bm", "10.0.32.40"),
-  A("katla.oob", "10.0.33.40"),
+  A("wiki", IPV4["konqi.he"]),
+  AAAA("wiki", IPV6["konqi.he"]),
 
-  A("ramoth.ams", "10.0.48.5"),
-  A("ramoth.oob", "10.0.49.5"),
+  // Overpass server
 
-  // Development server with wildcard alias for user sites
+  HTTPS("query", 1, ".", "alpn=h2"),
 
-  A("errol", "193.60.236.13"),
-  A("dev", "193.60.236.13"),
-  A("*.dev", "193.60.236.13"),
-  A("ooc", "193.60.236.13"),
-  A("a.ooc", "193.60.236.13"),
-  A("b.ooc", "193.60.236.13"),
-  A("c.ooc", "193.60.236.13"),
-  A("npe", "193.60.236.13"),
-  A("errol.ucl", "10.0.0.14"),
-  A("errol.oob", "10.0.1.14"),
+  A("query", IPV4["grisu.he"]),
+  AAAA("query", IPV6["grisu.he"]),
 
-  // Foundation server
+  // GPS tile server
 
-  A("ridley", "193.60.236.19"),
-  A("otrs", "193.60.236.19"),
-  A("blog", "193.60.236.19"),
-  A("foundation", "193.60.236.19"),
-  A("hot", "193.60.236.19"),
-  A("dmca", "193.60.236.19"),
-  A("ridley.ucl", "10.0.0.3"),
-  A("ridley.oob", "10.0.1.3"),
+  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"),
 
-  // Piwik server
+  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"]),
 
-  A("eustace", "193.60.236.14"),
-  A("piwik", "193.60.236.14"),
-  A("eustace.ucl", "10.0.0.9"),
-  A("eustace.oob", "10.0.1.9"),
+  // Donation site and new OSMF crm site
 
-  // Imagery servers
+  HTTPS("donate", 1, ".", "alpn=h2"),
+  HTTPS("support", 1, ".", "alpn=h2"),
+  HTTPS("supporting", 1, ".", "alpn=h2"),
 
-  A("draco", "193.60.236.12"),
-  A("draco.ucl", "10.0.0.11"),
-  A("draco.oob", "10.0.1.11"),
-
-  A("kessie", "178.250.74.36"),
-  AAAA("kessie", "2a02:1658:4:0:dad3:85ff:fe5d:875e"),
-  A("agri", "178.250.74.36", TTL("1h")),
-  AAAA("agri", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("a.agri", "178.250.74.36", TTL("1h")),
-  AAAA("a.agri", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("b.agri", "178.250.74.36", TTL("1h")),
-  AAAA("b.agri", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("c.agri", "178.250.74.36", TTL("1h")),
-  AAAA("c.agri", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("os", "178.250.74.36", TTL("1h")),
-  AAAA("os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("a.os", "178.250.74.36", TTL("1h")),
-  AAAA("a.os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("b.os", "178.250.74.36", TTL("1h")),
-  AAAA("b.os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("c.os", "178.250.74.36", TTL("1h")),
-  AAAA("c.os", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("1h")),
-  A("kessie.oob", "178.250.74.37"),
-
-  // Munin server
-
-  A("urmel", "193.60.236.21"),
-  A("munin", "193.60.236.21"),
-  A("urmel.ucl", "10.0.0.6"),
-  A("urmel.oob", "10.0.1.6"),
-
-  // Chef server
-
-  A("sarel", "193.60.236.20"),
-  A("chef", "193.60.236.20"),
-  A("hardware", "193.60.236.20"),
-  A("acme", "193.60.236.20"),
-  A("git", "193.60.236.20", TTL("10m")),
-  A("dns", "193.60.236.20", TTL("10m")),
-  A("sarel.ucl", "10.0.0.12"),
-  A("sarel.oob", "10.0.1.12"),
-
-  // Forum server
-
-  A("clifford", "193.60.236.11"),
-  A("forum", "193.60.236.11", TTL("10m")),
-  A("clifford.ucl", "10.0.0.17"),
-  A("clifford.oob", "10.0.1.17"),
-
-  // KVMs
-
-  A("kvm1.ucl", "10.0.0.21"),
-
-  // Managed network switches
-
-  A("switch1", "130.117.76.2"),
-  AAAA("switch1", "2001:978:2:2c::172:2"),
-
-  // Managed power strips
-
-  A("pdu1.ams", "10.0.48.100"),
-  A("pdu2.ams", "10.0.48.101"),
+  A("donate", IPV4["ridley"]),
+  A("support", IPV4["ridley"]),
+  A("supporting", IPV4["ridley"]),
 
-  // Bytemark machine, and the services which operate from it
+  // Discourse server ("community")
 
-  A("shenron", "212.110.172.32"),
-  AAAA("shenron", "2001:41c9:1:400::32"),
-  A("mail", "212.110.172.32"),
-  AAAA("mail", "2001:41c9:1:400::32"),
-  A("mta-sts", "212.110.172.32"),
-  AAAA("mta-sts", "2001:41c9:1:400::32"),
-  A("lists", "212.110.172.32"),
-  AAAA("lists", "2001:41c9:1:400::32"),
-  A("svn", "212.110.172.32"),
-  AAAA("svn", "2001:41c9:1:400::32"),
-  A("trac", "212.110.172.32"),
-  AAAA("trac", "2001:41c9:1:400::32"),
-  A("irc", "212.110.172.32"),
-  AAAA("irc", "2001:41c9:1:400::32"),
-  A("help", "212.110.172.32"),
-  AAAA("help", "2001:41c9:1:400::32"),
-  A("blogs", "212.110.172.32", TTL("10m")),
-  AAAA("blogs", "2001:41c9:1:400::32", TTL("10m")),
-  A("shenron.bm", "10.0.16.3"),
+  HTTPS("community", 1, ".", "alpn=h2"),
+  HTTPS("communities", 1, ".", "alpn=h2"),
+  HTTPS("c", 1, ".", "alpn=h2"),
 
-  // Wiki servers
+  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("tabaluga", "130.117.76.14"),
-  AAAA("tabaluga", "2001:978:2:2c::172:e"),
-  A("wiki", "130.117.76.14", TTL("10m")),
-  AAAA("wiki", "2001:978:2:2c::172:e", TTL("10m")),
-  A("tabaluga.ams", "10.0.48.14"),
-  A("tabaluga.oob", "10.0.49.14"),
+  CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
+  TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
 
-  // GPS tile server
+  HTTPS("forum", 1, ".", "alpn=h2"),
 
-  A("noquiklos", "193.60.236.16"),
-  A("gps-tile", "193.60.236.16"),
-  A("a.gps-tile", "193.60.236.16"),
-  A("b.gps-tile", "193.60.236.16"),
-  A("c.gps-tile", "193.60.236.16"),
-  A("gps.tile", "193.60.236.16"),
-  A("gps-a.tile", "193.60.236.16"),
-  A("gps-b.tile", "193.60.236.16"),
-  A("gps-c.tile", "193.60.236.16"),
-  A("noquiklos.ucl", "10.0.0.13"),
-  A("noquiklos.oob", "10.0.1.13"),
-
-  // Tile cache servers
-
-  A("gorynych", "5.45.248.21"),
-  AAAA("gorynych", "2a02:6b8:b010:5065::a001"),
-  A("trogdor", "134.90.146.26"),
-  A("trogdor.oob", "134.90.146.30"),
-  A("ridgeback", "31.169.50.10"),
-  A("ridgeback.oob", "31.169.50.14"),
-  A("jakelong", "71.19.155.177"),
-  AAAA("jakelong", "2605:2700:0:17:a800:ff:fe3e:cdca"),
-  A("nepomuk", "77.95.65.39"),
-  AAAA("nepomuk", "2a03:9180:0:100::7"),
-  A("simurgh", "94.20.20.55"),
-  A("katie", "144.76.70.77"),
-  AAAA("katie", "2a01:4f8:191:834c::2"),
-  A("konqi", "81.7.11.83"),
-  AAAA("konqi", "2a02:180:1:1::517:b53"),
-  A("longma", "140.110.240.7"),
-  AAAA("longma", "2001:e10:2000:240::7"),
-  A("viserion", "193.198.233.211"),
-  AAAA("viserion", "2001:b68:4cff:3::3"),
-  A("drogon", "161.53.30.107"),
-  AAAA("drogon", "2001:b68:c0ff:0:221:5eff:fe40:c7c4"),
-  A("saphira", "185.73.44.30"),
-  AAAA("saphira", "2001:ba8:0:2c1e::"),
-  A("toothless", "185.73.44.167"),
-  AAAA("toothless", "2001:ba8:0:2ca7::"),
-  A("sarkany", "37.17.173.8"),
-  AAAA("sarkany", "2001:4c48:2:bf04:250:56ff:fe8f:5c81"),
-  A("cmok", "31.130.201.40"),
-  AAAA("cmok", "2001:67c:2268:1005:21e:8cff:fe8c:8d3b"),
-  A("stormfly-02", "140.211.167.105"),
-  AAAA("stormfly-02", "2605:bc80:3010:700::8cde:a769"),
-  A("stormfly-02.oob", "10.0.0.108"),
-  A("rimfaxe", "130.225.254.109"),
-  AAAA("rimfaxe", "2001:878:346::109"),
-  A("culebre", "155.210.4.103"),
-  A("kalessin", "185.66.195.245"),
-  AAAA("kalessin", "2a03:2260:2000:1::5"),
-  A("angor", "196.10.54.165"),
-  // AAAA("angor", "2001:43f8:1f4:b00:b283:feff:fed8:dd45"),
-  A("ladon", "83.212.2.116"),
-  AAAA("ladon", "2001:648:2ffe:4::116"),
-  A("ascalon", "184.107.48.228"),
-  A("noomoahk", "91.224.148.166"),
-  AAAA("noomoahk", "2a03:7220:8080:a600::1"),
-  A("cherufe", "200.91.44.37"),
-  A("norbert", "89.234.186.100"),
-  AAAA("norbert", "2a00:5884:821c::1"),
-  A("chrysophylax", "217.71.244.22"),
-  AAAA("chrysophylax", "2001:8e0:40:2039::10"),
-  A("necrosan", "80.67.167.77"),
-  AAAA("necrosan", "2a0b:cbc0:110d:1::1c"),
-  A("keizer", "195.201.226.63"),
-  AAAA("keizer", "2a01:4f8:1c1c:bc54::1"),
-  A("vipertooth", "176.122.99.101"),
-  AAAA("vipertooth", "2001:67c:2d40::65"),
-  A("tuatara", "114.23.141.203"),
-  AAAA("tuatara", "2406:1e00:b410:c24:529a:4cff:fe79:bc3b"),
-  A("waima", "103.197.61.160"),
-  A("nidhogg", "130.236.254.221"),
-  AAAA("nidhogg", "2001:6b0:17:f0a0::dd"),
-  A("boitata", "200.236.31.207"),
-  AAAA("boitata", "2801:82:80ff:8002:216:ccff:feaa:21"),
-  A("fafnir", "130.239.18.114"),
-  AAAA("fafnir", "2001:6b0:e:2a18::114"),
-  A("fume", "147.228.60.16"),
-  A("balerion", "138.44.68.134"),
-  A("naga", "185.116.130.151"),
-
-  // Blades
-
-  A("tiamat-00", "193.60.236.40"),
-  A("tiamat-00.ucl", "10.0.0.40"),
-  A("tiamat-00.oob", "10.0.1.40"),
-  A("tiamat-01", "193.60.236.41"),
-  A("tiamat-01.ucl", "10.0.0.41"),
-  A("tiamat-01.oob", "10.0.1.41"),
-  A("tiamat-02", "193.60.236.42"),
-  A("tiamat-02.ucl", "10.0.0.42"),
-  A("tiamat-02.oob", "10.0.1.42"),
-  A("tiamat-03", "193.60.236.43"),
-  A("tiamat-03.ucl", "10.0.0.43"),
-  A("tiamat-03.oob", "10.0.1.43"),
-  A("tiamat-10", "193.60.236.44"),
-  A("tiamat-10.ucl", "10.0.0.44"),
-  A("tiamat-10.oob", "10.0.1.44"),
-  A("tiamat-11", "193.60.236.45"),
-  A("tiamat-11.ucl", "10.0.0.45"),
-  A("tiamat-11.oob", "10.0.1.45"),
-  A("tiamat-12", "193.60.236.46"),
-  A("tiamat-12.ucl", "10.0.0.46"),
-  A("tiamat-12.oob", "10.0.1.46"),
-  A("tiamat-13", "193.60.236.47"),
-  A("tiamat-13.ucl", "10.0.0.47"),
-  A("tiamat-13.oob", "10.0.1.47"),
-  A("tiamat-20", "193.60.236.48"),
-  A("tiamat-20.ucl", "10.0.0.48"),
-  A("tiamat-20.oob", "10.0.1.48"),
-  A("tiamat-21", "193.60.236.49"),
-  A("tiamat-21.ucl", "10.0.0.49"),
-  A("tiamat-21.oob", "10.0.1.49"),
-  A("tiamat-22", "193.60.236.50"),
-  A("tiamat-22.ucl", "10.0.0.50"),
-  A("tiamat-22.oob", "10.0.1.50"),
-  A("tiamat-23", "193.60.236.51"),
-  A("tiamat-23.ucl", "10.0.0.51"),
-  A("tiamat-23.oob", "10.0.1.51"),
-
-  // Donation site
-
-  A("donate", "193.60.236.19", TTL("10m")),
+  A("forum", IPV4["fume.he"]),
+  AAAA("forum", IPV6["fume.he"]),
 
-  // Uptime site at StatusCake
+  // Taginfo and Staging Blog Server
 
-  CNAME("uptime", "uptimessl.statuscake.com."),
+  HTTPS("taginfo", 1, ".", "alpn=h2"),
 
-  // Custom Domain for https://github.com/osmfoundation/welcome-mat/
+  A("taginfo", IPV4["tabaluga"]),
+  AAAA("taginfo", IPV6["tabaluga"]),
 
-  CNAME("welcome", "osmfoundation.github.io."),
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
 
-  // Dynamic DNS records
+  A("staging.blog", IPV4["tabaluga"]),
+  AAAA("staging.blog", IPV6["tabaluga"]),
+
+  // Uptime site at StatusCake
 
-  DYNAMIC_RECORDS
+  CNAME("uptime", "uptimessl-new.statuscake.com.")
 
 );