X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/87d50b65f1302e574773f759b49560299d829fb8..eb1cd43e4093c1f3304307dacc064fc0a6499881:/src/openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 75d9c07..f7f5106 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -22,6 +22,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("messages", 10, QUALIFY("a.mx")),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),
+  MX("community", 10, QUALIFY("a.mx")),
   A("a.mx", SHENRON_IPV4),
   AAAA("a.mx", SHENRON_IPV6),
 
@@ -29,11 +30,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "@",
-    ttl: "1h",
     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
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -41,11 +43,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "messages",
-    ttl: "1h",
     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
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -53,11 +56,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "noreply",
-    ttl: "1h",
     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
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -65,11 +69,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "otrs",
-    ttl: "1h",
     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
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    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
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -104,160 +122,105 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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")),
 
   // 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("balerion")),
-  NS("geo", QUALIFY("chrysophylax")),
-  NS("geo", QUALIFY("saphira")),
-  NS("geo", QUALIFY("stormfly-04")),
-  NS("geo", QUALIFY("ridgeback")),
-
   // Main web servers and their aliases
 
   A("spike-01", SPIKE01_IPV4),
   AAAA("spike-01", SPIKE01_IPV6),
-  // A("@", SPIKE01_IPV4, TTL("10m")),
-  // AAAA("@", SPIKE01_IPV6, TTL("10m")),
-  // A("www", SPIKE01_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE01_IPV6, TTL("10m")),
-  // A("api", SPIKE01_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE01_IPV6, TTL("10m")),
-  // A("maps", SPIKE01_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE01_IPV6, TTL("10m")),
-  // A("mapz", SPIKE01_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE01_IPV6, TTL("10m")),
+  // 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, TTL("10m")),
-  // AAAA("@", SPIKE02_IPV6, TTL("10m")),
-  // A("www", SPIKE02_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE02_IPV6, TTL("10m")),
-  // A("api", SPIKE02_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE02_IPV6, TTL("10m")),
-  // A("maps", SPIKE02_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE02_IPV6, TTL("10m")),
-  // A("mapz", SPIKE02_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE02_IPV6, TTL("10m")),
+  // 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, TTL("10m")),
-  // AAAA("@", SPIKE03_IPV6, TTL("10m")),
-  // A("www", SPIKE03_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE03_IPV6, TTL("10m")),
-  // A("api", SPIKE03_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE03_IPV6, TTL("10m")),
-  // A("maps", SPIKE03_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE03_IPV6, TTL("10m")),
-  // A("mapz", SPIKE03_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE03_IPV6, TTL("10m")),
+  // 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-04", SPIKE04_IPV4),
-  AAAA("spike-04", SPIKE04_IPV6),
-  // A("@", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("@", SPIKE04_IPV6, TTL("10m")),
-  // A("www", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE04_IPV6, TTL("10m")),
-  // A("api", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE04_IPV6, TTL("10m")),
-  // A("maps", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE04_IPV6, TTL("10m")),
-  // A("mapz", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE04_IPV6, TTL("10m")),
-  A("spike-04.bm", SPIKE04_INTERNAL),
-  A("spike-04.oob", SPIKE04_OOB),
-
-  A("spike-05", SPIKE05_IPV4),
-  AAAA("spike-05", SPIKE05_IPV6),
-  // A("@", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("@", SPIKE05_IPV6, TTL("10m")),
-  // A("www", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE05_IPV6, TTL("10m")),
-  // A("api", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE05_IPV6, TTL("10m")),
-  // A("maps", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE05_IPV6, TTL("10m")),
-  // A("mapz", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE05_IPV6, TTL("10m")),
-  A("spike-05.bm", SPIKE05_INTERNAL),
-  A("spike-05.oob", SPIKE05_OOB),
-
   A("spike-06", SPIKE06_IPV4),
   AAAA("spike-06", SPIKE06_IPV6),
-  A("@", SPIKE06_IPV4, TTL("10m")),
-  AAAA("@", SPIKE06_IPV6, TTL("10m")),
-  A("www", SPIKE06_IPV4, TTL("10m")),
-  AAAA("www", SPIKE06_IPV6, TTL("10m")),
-  A("api", SPIKE06_IPV4, TTL("10m")),
-  AAAA("api", SPIKE06_IPV6, TTL("10m")),
-  A("maps", SPIKE06_IPV4, TTL("10m")),
-  AAAA("maps", SPIKE06_IPV6, TTL("10m")),
-  A("mapz", SPIKE06_IPV4, TTL("10m")),
-  AAAA("mapz", SPIKE06_IPV6, TTL("10m")),
+  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, TTL("10m")),
-  AAAA("@", SPIKE07_IPV6, TTL("10m")),
-  A("www", SPIKE07_IPV4, TTL("10m")),
-  AAAA("www", SPIKE07_IPV6, TTL("10m")),
-  A("api", SPIKE07_IPV4, TTL("10m")),
-  AAAA("api", SPIKE07_IPV6, TTL("10m")),
-  A("maps", SPIKE07_IPV4, TTL("10m")),
-  AAAA("maps", SPIKE07_IPV6, TTL("10m")),
-  A("mapz", SPIKE07_IPV4, TTL("10m")),
-  AAAA("mapz", SPIKE07_IPV6, TTL("10m")),
+  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, TTL("10m")),
-  AAAA("@", SPIKE08_IPV6, TTL("10m")),
-  A("www", SPIKE08_IPV4, TTL("10m")),
-  AAAA("www", SPIKE08_IPV6, TTL("10m")),
-  A("api", SPIKE08_IPV4, TTL("10m")),
-  AAAA("api", SPIKE08_IPV6, TTL("10m")),
-  A("maps", SPIKE08_IPV4, TTL("10m")),
-  AAAA("maps", SPIKE08_IPV6, TTL("10m")),
-  A("mapz", SPIKE08_IPV4, TTL("10m")),
-  AAAA("mapz", SPIKE08_IPV6, TTL("10m")),
+  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),
 
-  // Rails application servers
-
-  A("thorn-02.ams", THORN02_INTERNAL),
-  A("rails2.ams", THORN02_INTERNAL),
-  A("thorn-02.oob", THORN02_OOB),
-
-  A("thorn-03.ams", THORN03_INTERNAL),
-  A("rails3.ams", THORN03_INTERNAL),
-  A("thorn-03.oob", THORN03_OOB),
-
-  A("thorn-04.bm", THORN04_INTERNAL),
-  A("rails4.bm", THORN04_INTERNAL),
-  A("thorn-04.oob", THORN04_OOB),
-
-  A("thorn-05.bm", THORN05_INTERNAL),
-  A("rails5.bm", THORN05_INTERNAL),
-  A("thorn-05.oob", THORN05_OOB),
-
   // Nominatim servers
 
   A("pummelzacken", PUMMELZACKEN_IPV4),
@@ -269,12 +232,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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),
 
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
+  CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
 
   // Taginfo server
 
@@ -285,11 +254,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Tile servers
 
-  A("orm", ORM_IPV4),
-  AAAA("orm", ORM_IPV6),
-  A("orm.ams", ORM_INTERNAL),
-  A("orm.oob", ORM_OOB),
-
   A("odin", ODIN_IPV4),
   AAAA("odin", ODIN_IPV6),
   A("odin.ams", ODIN_INTERNAL),
@@ -304,14 +268,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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("pyrene", PYRENE_IPV4),
   AAAA("pyrene", PYRENE_IPV6),
-  A("pyrene.oob", TIAMAT00_INTERNAL),
+  A("pyrene.oob", PYRENE_OOB),
 
   A("bowser", BOWSER_IPV4),
 
@@ -323,10 +293,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 
-  CNAME("tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
-  CNAME("a.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
-  CNAME("b.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
-  CNAME("c.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
+  CNAME("tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+
+  A("render", CULEBRE_IPV4),
+  A("render", NIDHOGG_IPV4),
+  AAAA("render", CULEBRE_IPV6),
+  AAAA("render", NIDHOGG_IPV6),
 
   // Services machine
 
@@ -341,15 +316,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
+  A("norbert", NORBERT_IPV4),
+  AAAA("norbert", NORBERT_IPV6),
+  // A("backup", NORBERT_IPV4, TTL("10m")),
+  // AAAA("backup", NORBERT_IPV6, TTL("10m")),
+  // A("planet", NORBERT_IPV4, TTL("10m")),
+  // AAAA("planet", NORBERT_IPV6, TTL("10m")),
+  A("norbert.ams", NORBERT_INTERNAL),
+  A("norbert.oob", NORBERT_OOB),
+
   A("fafnir", FAFNIR_IPV4),
   AAAA("fafnir", FAFNIR_IPV6),
   // A("backup", FAFNIR_IPV4, TTL("10m")),
   // AAAA("backup", FAFNIR_IPV6, TTL("10m")),
   // A("planet", FAFNIR_IPV4, TTL("10m")),
   // AAAA("planet", FAFNIR_IPV6, TTL("10m")),
-  A("fafnir.bm", FAFNIR_INTERNAL),
+  A("fafnir.dub", FAFNIR_INTERNAL),
   A("fafnir.oob", FAFNIR_OOB),
 
+  A("horntail", HORNTAIL_IPV4),
+  AAAA("horntail", HORNTAIL_IPV6),
+  // A("backup", HORNTAIL_IPV4, TTL("10m")),
+  // AAAA("backup", HORNTAIL_IPV6, TTL("10m")),
+  // A("planet", HORNTAIL_IPV4, TTL("10m")),
+  // AAAA("planet", HORNTAIL_IPV6, TTL("10m")),
+  A("horntail.dub", HORNTAIL_INTERNAL),
+  A("horntail.oob", HORNTAIL_OOB),
+
   A("grisu", GRISU_IPV4),
   AAAA("grisu", GRISU_IPV6),
   // A("backup", GRISU_IPV4, TTL("10m")),
@@ -379,21 +372,26 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("katla.bm", KATLA_INTERNAL),
   A("katla.oob", KATLA_OOB),
 
-  A("ramoth.ams", RAMOTH_INTERNAL),
-  A("ramoth.oob", RAMOTH_OOB),
-
   // Development server with wildcard alias for user sites
 
-  A("errol", ERROL_IPV4),
-  A("dev", ERROL_IPV4),
-  A("*.dev", ERROL_IPV4),
-  A("ooc", ERROL_IPV4),
-  A("a.ooc", ERROL_IPV4),
-  A("b.ooc", ERROL_IPV4),
-  A("c.ooc", ERROL_IPV4),
-  A("npe", ERROL_IPV4),
-  A("errol.ucl", ERROL_INTERNAL),
-  A("errol.oob", ERROL_OOB),
+  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),
 
   // Foundation server
 
@@ -406,9 +404,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
-  // Piwik server
+  // Matomo server
 
   A("eustace", EUSTACE_IPV4),
+  A("matomo", EUSTACE_IPV4),
   A("piwik", EUSTACE_IPV4),
   A("eustace.ucl", EUSTACE_INTERNAL),
   A("eustace.oob", EUSTACE_OOB),
@@ -439,13 +438,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("c.os", KESSIE_IPV6, TTL("1h")),
   A("kessie.oob", KESSIE_OOB),
 
-  // Munin server
-
-  A("urmel", URMEL_IPV4),
-  A("munin", URMEL_IPV4),
-  A("urmel.ucl", URMEL_INTERNAL),
-  A("urmel.oob", URMEL_OOB),
-
   // Prometheus server
 
   A("stormfly-03", STORMFLY03_IPV4),
@@ -454,16 +446,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")),
   A("stormfly-03.oob", STORMFLY03_OOB),
 
-  // Chef server
+  // Management server
 
-  A("sarel", SAREL_IPV4),
-  A("chef", SAREL_IPV4),
-  A("hardware", SAREL_IPV4),
-  A("acme", SAREL_IPV4),
-  A("git", SAREL_IPV4, TTL("10m")),
-  A("dns", SAREL_IPV4, TTL("10m")),
-  A("sarel.ucl", SAREL_INTERNAL),
-  A("sarel.oob", SAREL_OOB),
+  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),
 
   // Forum server
 
@@ -472,15 +470,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("clifford.ucl", CLIFFORD_INTERNAL),
   A("clifford.oob", CLIFFORD_OOB),
 
-  // Discourse server ("community")
-
-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
-  A("community", LOCKHEED_IPV4),
-  AAAA("community", LOCKHEED_IPV6),
-  A("lockheed.ams", LOCKHEED_INTERNAL),
-  A("lockheed.oob", LOCKHEED_OOB),
-
   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),
@@ -503,6 +492,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Out of band access servers
 
+  A("oob1.ams", OOB1AMS_INTERNAL),
+
   A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
@@ -515,17 +506,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("mta-sts", SHENRON_IPV6),
   A("lists", SHENRON_IPV4),
   AAAA("lists", SHENRON_IPV6),
-  A("svn", SHENRON_IPV4),
-  AAAA("svn", SHENRON_IPV6),
-  A("trac", SHENRON_IPV4),
-  AAAA("trac", SHENRON_IPV6),
-  A("irc", SHENRON_IPV4),
-  AAAA("irc", SHENRON_IPV6),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
-  A("blogs", SHENRON_IPV4, TTL("10m")),
-  AAAA("blogs", SHENRON_IPV6, TTL("10m")),
-  A("shenron.bm", SHENRON_INTERNAL),
+
+  // 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("naga.dub", NAGA_INTERNAL),
+  A("naga.oob", NAGA_OOB),
 
   // Wiki servers
 
@@ -582,11 +581,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),
-  A("chrysophylax", CHRYSOPHYLAX_IPV4),
-  AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
-  A("vipertooth", VIPERTOOTH_IPV4),
-  AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("fume", FUME_IPV4),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
   A("neak", NEAK_IPV4),
@@ -594,63 +588,30 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("meraxes", MERAXES_IPV6),
   A("firnen", FIRNEN_IPV4),
 
-  // Blades
-
-  A("tiamat-00", TIAMAT00_IPV4),
-  A("tiamat-00.ucl", TIAMAT00_INTERNAL),
-  A("tiamat-00.oob", TIAMAT00_OOB),
-  A("tiamat-01", TIAMAT01_IPV4),
-  A("tiamat-01.ucl", TIAMAT01_INTERNAL),
-  A("tiamat-01.oob", TIAMAT01_OOB),
-  A("tiamat-02", TIAMAT02_IPV4),
-  A("tiamat-02.ucl", TIAMAT02_INTERNAL),
-  A("tiamat-02.oob", TIAMAT02_OOB),
-  A("tiamat-03", TIAMAT03_IPV4),
-  A("tiamat-03.ucl", TIAMAT03_INTERNAL),
-  A("tiamat-03.oob", TIAMAT03_OOB),
-  A("tiamat-10", TIAMAT10_IPV4),
-  A("tiamat-10.ucl", TIAMAT10_INTERNAL),
-  A("tiamat-10.oob", TIAMAT10_OOB),
-  A("tiamat-11", TIAMAT11_IPV4),
-  A("tiamat-11.ucl", TIAMAT11_INTERNAL),
-  A("tiamat-11.oob", TIAMAT11_OOB),
-  A("tiamat-12", TIAMAT12_IPV4),
-  A("tiamat-12.ucl", TIAMAT12_INTERNAL),
-  A("tiamat-12.oob", TIAMAT12_OOB),
-  A("tiamat-13", TIAMAT13_IPV4),
-  A("tiamat-13.ucl", TIAMAT13_INTERNAL),
-  A("tiamat-13.oob", TIAMAT13_OOB),
-  A("tiamat-20", TIAMAT20_IPV4),
-  A("tiamat-20.ucl", TIAMAT20_INTERNAL),
-  A("tiamat-20.oob", TIAMAT20_OOB),
-  A("tiamat-21", TIAMAT21_IPV4),
-  A("tiamat-21.ucl", TIAMAT21_INTERNAL),
-  A("tiamat-21.oob", TIAMAT21_OOB),
-  A("tiamat-22", TIAMAT22_IPV4),
-  A("tiamat-22.ucl", TIAMAT22_INTERNAL),
-  A("tiamat-22.oob", TIAMAT22_OOB),
-  A("tiamat-23", TIAMAT23_IPV4),
-  A("tiamat-23.ucl", TIAMAT23_INTERNAL),
-  A("tiamat-23.oob", TIAMAT23_OOB),
-
   // Spare
 
-  A("idris", IDRIS_IPV4),
-  AAAA("idris", IDRIS_IPV6),
-  A("idris.dub", IDRIS_INTERNAL),
-  A("idris.oob", IDRIS_OOB),
   A("konqi", KONQI_IPV4),
   AAAA("konqi", KONQI_IPV6),
   A("konqi.dub", KONQI_INTERNAL),
   A("konqi.oob", KONQI_OOB),
-  A("naga", NAGA_IPV4),
-  AAAA("naga", NAGA_IPV6),
-  A("naga.dub", NAGA_INTERNAL),
-  A("naga.oob", NAGA_OOB),
+
+  A("sarel", SAREL_IPV4),
+  A("sarel.ucl", SAREL_INTERNAL),
+  A("sarel.oob", SAREL_OOB),
+  // Temporary name for discourse fluxbb import test
+  A("forum-import-test", SAREL_IPV4),
+
+  // Discourse server ("community")
+
   A("jakelong", JAKELONG_IPV4),
   AAAA("jakelong", JAKELONG_IPV6),
+  A("community", JAKELONG_IPV4),
+  A("communities", JAKELONG_IPV4),
+  AAAA("community", JAKELONG_IPV6),
+  AAAA("communities", JAKELONG_IPV6),
   A("jakelong.dub", JAKELONG_INTERNAL),
   A("jakelong.oob", JAKELONG_OOB),
+  CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
 
   // Donation site