]> 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
Point qa-tile.nominatim at longma
[dns.git] / src / openstreetmap.js
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index e3c09183e1f09224814094e5654bb6ffb87af39a..eb1ff9862f1f33346028e340a9eed08f410de3e3 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -38,15 +38,13 @@ 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: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
+      "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
       "-all"
     ]
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -56,15 +54,13 @@ 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: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
+      "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
       "-all"
     ]
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -74,15 +70,13 @@ 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: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
+      "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
       "-all"
     ]
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -92,15 +86,13 @@ 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: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
+      "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
       "-all"
     ]
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -110,15 +102,13 @@ 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: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
+      "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
       "-all"
     ]
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -128,15 +118,13 @@ 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: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
+      "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
       "-all"
     ]
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -231,49 +219,55 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("spike-06", SPIKE06_IPV4),
   AAAA("spike-06", SPIKE06_IPV6),
 
   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("@", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("@", SPIKE06_IPV6, CF_PROXY_ON),
+  A("www", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("www", SPIKE06_IPV6, CF_PROXY_ON),
+  A("api", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("api", SPIKE06_IPV6, CF_PROXY_ON),
+  A("maps", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("maps", SPIKE06_IPV6, CF_PROXY_ON),
+  A("mapz", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("mapz", SPIKE06_IPV6, CF_PROXY_ON),
   A("spike-06.ams", SPIKE06_INTERNAL),
   A("spike-06.oob", SPIKE06_OOB),
 
   A("spike-07", SPIKE07_IPV4),
   AAAA("spike-07", SPIKE07_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("@", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("@", SPIKE07_IPV6, CF_PROXY_ON),
+  A("www", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("www", SPIKE07_IPV6, CF_PROXY_ON),
+  A("api", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("api", SPIKE07_IPV6, CF_PROXY_ON),
+  A("maps", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("maps", SPIKE07_IPV6, CF_PROXY_ON),
+  A("mapz", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("mapz", SPIKE07_IPV6, CF_PROXY_ON),
   A("spike-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 
   A("spike-08", SPIKE08_IPV4),
   AAAA("spike-08", SPIKE08_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("@", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("@", SPIKE08_IPV6, CF_PROXY_ON),
+  A("www", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("www", SPIKE08_IPV6, CF_PROXY_ON),
+  A("api", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("api", SPIKE08_IPV6, CF_PROXY_ON),
+  A("maps", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("maps", SPIKE08_IPV6, CF_PROXY_ON),
+  A("mapz", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("mapz", SPIKE08_IPV6, CF_PROXY_ON),
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("www", 1, ".", "alpn=h2"),
+  HTTPS("api", 1, ".", "alpn=h2"),
+  HTTPS("maps", 1, ".", "alpn=h2"),
+  HTTPS("mapz", 1, ".", "alpn=h2"),
+
   // Nominatim servers
 
   A("dulcy", DULCY_IPV4),
   // Nominatim servers
 
   A("dulcy", DULCY_IPV4),
@@ -299,15 +293,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qa-tile.nominatim", "longma.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
 
   A("odin", ODIN_IPV4),
   // Tile servers
 
   A("odin", ODIN_IPV4),
@@ -328,10 +313,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("nidhogg", NIDHOGG_IPV6),
   A("nidhogg.oob", NIDHOGG_OOB),
 
   AAAA("nidhogg", NIDHOGG_IPV6),
   A("nidhogg.oob", NIDHOGG_OOB),
 
+  A("wawel", WAWEL_IPV4),
+
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 
   A("rhaegal", RHAEGAL_IPV4),
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 
   A("rhaegal", RHAEGAL_IPV4),
+  AAAA("rhaegal", RHAEGAL_IPV6),
 
   A("palulukon", PALULUKON_IPV4),
 
 
   A("palulukon", PALULUKON_IPV4),
 
@@ -359,14 +347,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("render", CULEBRE_IPV6),
   AAAA("render", NIDHOGG_IPV6),
 
   AAAA("render", CULEBRE_IPV6),
   AAAA("render", NIDHOGG_IPV6),
 
+  // Vector tile servers
+
+  A("cmok", CMOK_IPV4),
+
+  CNAME("vector", "dualstack.n.sni.global.fastly.net."),
+
   // Site gateways
 
   A("ironbelly", IRONBELLY_IPV4),
   AAAA("ironbelly", IRONBELLY_IPV6),
   A("logstash", IRONBELLY_IPV4),
   AAAA("logstash", IRONBELLY_IPV6),
   // Site gateways
 
   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("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
@@ -386,6 +378,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("norbert.ams", NORBERT_INTERNAL),
   A("norbert.oob", NORBERT_OOB),
 
   A("norbert.ams", NORBERT_INTERNAL),
   A("norbert.oob", NORBERT_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("planet", 1, ".", "alpn=h2"),
+
   A("horntail", HORNTAIL_IPV4),
   AAAA("horntail", HORNTAIL_IPV6),
   // A("backup", HORNTAIL_IPV4),
   A("horntail", HORNTAIL_IPV4),
   AAAA("horntail", HORNTAIL_IPV6),
   // A("backup", HORNTAIL_IPV4),
@@ -436,12 +431,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   // Foundation server
 
   A("ridley", RIDLEY_IPV4),
   // 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),
 
   A("blog", RIDLEY_IPV4),
   A("foundation", RIDLEY_IPV4),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("blog", 1, ".", "alpn=h2"),
+  HTTPS("foundation", 1, ".", "alpn=h2"),
+
   // Matomo server
 
   A("smaug", SMAUG_IPV4),
   // Matomo server
 
   A("smaug", SMAUG_IPV4),
@@ -453,46 +451,54 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("smaug.dub", SMAUG_INTERNAL),
   A("smaug.oob", SMAUG_OOB),
 
   A("smaug.dub", SMAUG_INTERNAL),
   A("smaug.oob", SMAUG_OOB),
 
-  // Imagery servers
+  // HTTPS / SVCB records
+  HTTPS("matomo", 1, ".", "alpn=h2"),
+  HTTPS("piwik", 1, ".", "alpn=h2"),
 
 
-  A("draco", DRACO_IPV4),
-  A("draco.ucl", DRACO_INTERNAL),
-  A("draco.oob", DRACO_OOB),
+  // Imagery servers
 
   A("kessie", KESSIE_IPV4),
   AAAA("kessie", KESSIE_IPV6),
 
   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("agri", KESSIE_IPV4),
+  AAAA("agri", KESSIE_IPV6),
+  A("a.agri", KESSIE_IPV4),
+  AAAA("a.agri", KESSIE_IPV6),
+  A("b.agri", KESSIE_IPV4),
+  AAAA("b.agri", KESSIE_IPV6),
+  A("c.agri", KESSIE_IPV4),
+  AAAA("c.agri", KESSIE_IPV6),
+  A("os", KESSIE_IPV4),
+  AAAA("os", KESSIE_IPV6),
+  A("a.os", KESSIE_IPV4),
+  AAAA("a.os", KESSIE_IPV6),
+  A("b.os", KESSIE_IPV4),
+  AAAA("b.os", KESSIE_IPV6),
+  A("c.os", KESSIE_IPV4),
+  AAAA("c.os", KESSIE_IPV6),
   A("kessie.oob", KESSIE_OOB),
 
   A("kessie.oob", KESSIE_OOB),
 
-  // Prometheus server
+  // Prometheus server and munin redirect
 
   A("stormfly-03", STORMFLY03_IPV4),
   AAAA("stormfly-03", STORMFLY03_IPV6),
   A("prometheus", STORMFLY03_IPV4),
   AAAA("prometheus", STORMFLY03_IPV6),
 
   A("stormfly-03", STORMFLY03_IPV4),
   AAAA("stormfly-03", STORMFLY03_IPV6),
   A("prometheus", STORMFLY03_IPV4),
   AAAA("prometheus", STORMFLY03_IPV6),
+  A("munin", STORMFLY03_IPV4),
+  AAAA("munin", STORMFLY03_IPV6),
   A("stormfly-03.oob", STORMFLY03_OOB),
 
   A("stormfly-03.oob", STORMFLY03_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("prometheus", 1, ".", "alpn=h2"),
+  HTTPS("munin", 1, ".", "alpn=h2"),
+
   // Management server
 
   A("idris", IDRIS_IPV4),
   AAAA("idris", IDRIS_IPV6),
   A("acme", IDRIS_IPV4),
   AAAA("acme", IDRIS_IPV6),
   // Management server
 
   A("idris", IDRIS_IPV4),
   AAAA("idris", IDRIS_IPV6),
   A("acme", IDRIS_IPV4),
   AAAA("acme", IDRIS_IPV6),
+  A("apt", IDRIS_IPV4),
+  AAAA("apt", IDRIS_IPV6),
   A("chef", IDRIS_IPV4),
   AAAA("chef", IDRIS_IPV6),
   A("dns", IDRIS_IPV4),
   A("chef", IDRIS_IPV4),
   AAAA("chef", IDRIS_IPV6),
   A("dns", IDRIS_IPV4),
@@ -504,6 +510,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("idris.dub", IDRIS_INTERNAL),
   A("idris.oob", IDRIS_OOB),
 
   A("idris.dub", IDRIS_INTERNAL),
   A("idris.oob", IDRIS_OOB),
 
+  // HTTPS / SVCB records
+  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"),
+
   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),
   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),
@@ -539,6 +552,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
 
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
 
+  // HTTPS / SVCB records
+  HTTPS("lists", 1, ".", "alpn=h2"),
+  HTTPS("help", 1, ".", "alpn=h2"),
+
   // Naga service
 
   A("naga", NAGA_IPV4),
   // Naga service
 
   A("naga", NAGA_IPV4),
@@ -551,8 +568,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("irc", NAGA_IPV6),
   A("blogs", NAGA_IPV4),
   AAAA("blogs", NAGA_IPV6),
   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),
   A("welcome", NAGA_IPV4),
   AAAA("welcome", NAGA_IPV6),
   A("operations", NAGA_IPV4),
@@ -561,6 +576,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("hot", NAGA_IPV6),
   A("dmca", NAGA_IPV4),
   AAAA("dmca", NAGA_IPV6),
   AAAA("hot", NAGA_IPV6),
   A("dmca", NAGA_IPV4),
   AAAA("dmca", NAGA_IPV6),
+  A("otrs", NAGA_IPV4),
+  AAAA("otrs", NAGA_IPV6),
+  A("birthday20", NAGA_IPV4),
+  AAAA("birthday20", NAGA_IPV6),
+
+  // HTTPS / SVCB records
+  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("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
 
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
 
@@ -573,14 +605,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("konqi.dub", KONQI_INTERNAL),
   A("konqi.oob", KONQI_OOB),
 
   A("konqi.dub", KONQI_INTERNAL),
   A("konqi.oob", KONQI_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("wiki", 1, ".", "alpn=h2"),
+
   // Overpass server
 
   // Overpass server
 
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
-  A("query", GORWEN_IPV4),
-  AAAA("query", GORWEN_IPV6),
-  A("gorwen.dub", GORWEN_INTERNAL),
-  A("gorwen.oob", GORWEN_OOB),
+  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 / SVCB records
+  HTTPS("query", 1, ".", "alpn=h2"),
 
   // GPS tile server
 
 
   // GPS tile server
 
@@ -605,6 +643,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("muirdris.dub", MUIRDRIS_INTERNAL),
   A("muirdris.oob", MUIRDRIS_OOB),
 
   A("muirdris.dub", MUIRDRIS_INTERNAL),
   A("muirdris.oob", MUIRDRIS_OOB),
 
+  // HTTPS / SVCB records
+  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"),
+
   // Tile cache servers
 
   A("ridgeback", RIDGEBACK_IPV4),
   // Tile cache servers
 
   A("ridgeback", RIDGEBACK_IPV4),
@@ -618,40 +665,92 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
 
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
 
-  // Discourse server ("community")
-
-  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"),
-  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),
 
   // Donation site and new OSMF crm site
 
   A("donate", RIDLEY_IPV4),
   A("support", RIDLEY_IPV4),
   A("supporting", RIDLEY_IPV4),
 
-  // Spare servers
+  // HTTPS / SVCB records
+  HTTPS("donate", 1, ".", "alpn=h2"),
+  HTTPS("support", 1, ".", "alpn=h2"),
+  HTTPS("supporting", 1, ".", "alpn=h2"),
+
+  A("lockheed", LOCKHEED_IPV4),
+  AAAA("lockheed", LOCKHEED_IPV6),
+  A("lockheed.ams", LOCKHEED_INTERNAL),
+  A("lockheed.oob", LOCKHEED_OOB),
+  A("tiler", LOCKHEED_IPV4),
+  AAAA("tiler", LOCKHEED_IPV6),
+  A("us-imagery", LOCKHEED_IPV4),
+  AAAA("us-imagery", LOCKHEED_IPV6),
+  A("a.us-imagery", LOCKHEED_IPV4),
+  AAAA("a.us-imagery", LOCKHEED_IPV6),
+  A("b.us-imagery", LOCKHEED_IPV4),
+  AAAA("b.us-imagery", LOCKHEED_IPV6),
+  A("c.us-imagery", LOCKHEED_IPV4),
+  AAAA("c.us-imagery", LOCKHEED_IPV6),
+
+  // HTTPS / SVCB records
+  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"),
+
+  // Discourse server ("community")
 
   A("fume", FUME_IPV4),
   AAAA("fume", FUME_IPV6),
   A("fume.dub", FUME_INTERNAL),
   A("fume.oob", FUME_OOB),
 
 
   A("fume", FUME_IPV4),
   AAAA("fume", FUME_IPV6),
   A("fume.dub", FUME_INTERNAL),
   A("fume.oob", FUME_OOB),
 
-  A("grisu", GRISU_IPV4),
-  AAAA("grisu", GRISU_IPV6),
-  A("grisu.dub", GRISU_INTERNAL),
-  A("grisu.oob", GRISU_OOB),
+  A("community", FUME_IPV4),
+  A("communities", FUME_IPV4),
+  A("c", FUME_IPV4),
+  AAAA("community", FUME_IPV6),
+  AAAA("communities", FUME_IPV6),
+  AAAA("c", FUME_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("community", 1, ".", "alpn=h2"),
+  HTTPS("communities", 1, ".", "alpn=h2"),
+  HTTPS("c", 1, ".", "alpn=h2"),
+
+  CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
+  TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
+
+  A("forum", FUME_IPV4),
+  AAAA("forum", FUME_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("forum", 1, ".", "alpn=h2"),
+
+  // Taginfo and Staging Blog Server
+
+  A("tabaluga", TABALUGA_IPV4),
+  AAAA("tabaluga", TABALUGA_IPV6),
+  A("tabaluga.ams", TABALUGA_INTERNAL),
+  A("tabaluga.oob", TABALUGA_OOB),
+
+  A("staging.blog", TABALUGA_IPV4),
+  AAAA("staging.blog", TABALUGA_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+
+  A("taginfo", TABALUGA_IPV4),
+  AAAA("taginfo", TABALUGA_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("taginfo", 1, ".", "alpn=h2"),
+
+  // Spare servers
+
+  A("dribble", DRIBBLE_IPV4),
+  AAAA("dribble", DRIBBLE_IPV6),
+  A("dribble.ams", DRIBBLE_INTERNAL),
+  A("dribble.oob", DRIBBLE_OOB),
 
   // Uptime site at StatusCake
 
 
   // Uptime site at StatusCake
 
OpenStreetMap DNS