]> 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
Move community site to jakelong
[dns.git] / src / openstreetmap.js
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index e1756c9d8f0c32111ac14c2bdc3e17f26ff0f3c7..2e3788f9ae499acec40bc5e1f2f0ce803d520794 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -1,10 +1,20 @@
 D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
 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"),
+  // 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
+    ],
+  }),
 
   // Use shenron as the MX host
 
 
   // Use shenron as the MX host
 
@@ -12,24 +22,102 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("messages", 10, QUALIFY("a.mx")),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 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")),
+  A("a.mx", SHENRON_IPV4),
+  AAAA("a.mx", SHENRON_IPV6),
 
   // Publish SPF records indicating that only shenron sends mail
 
 
   // 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: "@",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "messages",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "noreply",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "otrs",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "community",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "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"),
 
   // 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"),
 
   // 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")),
 
   // 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")),
 
   // Google postmaster tools verification
 
 
   // Google postmaster tools verification
 
@@ -38,471 +126,576 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Delegate geo.openstreetmap.org to PowerDNS
 
 
   // Delegate geo.openstreetmap.org to PowerDNS
 
+  NS("geo", QUALIFY("balerion")),
   NS("geo", QUALIFY("saphira")),
   NS("geo", QUALIFY("saphira")),
+  NS("geo", QUALIFY("stormfly-04")),
   NS("geo", QUALIFY("ridgeback")),
   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
 
 
   // 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"),
+  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("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("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("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("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("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("spike-08.ams", SPIKE08_INTERNAL),
+  A("spike-08.oob", SPIKE08_OOB),
 
   // Rails application servers
 
 
   // 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", THORN02_INTERNAL),
+  A("rails2.ams", THORN02_INTERNAL),
+  A("thorn-02.oob", THORN02_OOB),
 
 
-  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", THORN03_INTERNAL),
+  A("rails3.ams", THORN03_INTERNAL),
+  A("thorn-03.oob", THORN03_OOB),
 
 
-  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", THORN04_INTERNAL),
+  A("rails4.bm", THORN04_INTERNAL),
+  A("thorn-04.oob", THORN04_OOB),
 
 
-  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"),
+  A("thorn-05.bm", THORN05_INTERNAL),
+  A("rails5.bm", THORN05_INTERNAL),
+  A("thorn-05.oob", THORN05_OOB),
 
   // Nominatim servers
 
 
   // 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"),
+  A("pummelzacken", PUMMELZACKEN_IPV4),
+  A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL),
+  A("pummelzacken.oob", PUMMELZACKEN_OOB),
 
 
-  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"),
+  A("dulcy", DULCY_IPV4),
+  AAAA("dulcy", DULCY_IPV6),
+  A("dulcy.ams", DULCY_INTERNAL),
+  A("dulcy.oob", DULCY_OOB),
 
 
-  // Taginfo server
+  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("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"),
+  CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
+  CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
+  CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
 
 
-  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"),
+  // Taginfo server
+
+  A("grindtooth", GRINDTOOTH_IPV4),
+  A("taginfo", GRINDTOOTH_IPV4, TTL("10m")),
+  A("grindtooth.ucl", GRINDTOOTH_INTERNAL),
+  A("grindtooth.oob", GRINDTOOTH_OOB),
 
   // Tile servers
 
 
   // Tile servers
 
-  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("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),
+  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("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"),
+  A("scorch", SCORCH_IPV4),
+  AAAA("scorch", SCORCH_IPV6),
 
 
-  A("ysera", "193.60.236.22"),
-  A("ysera.ucl", "10.0.0.15"),
-  A("ysera.oob", "10.0.1.15"),
+  A("rhaegal", RHAEGAL_IPV4),
 
 
-  A("scorch", "176.31.235.79"),
-  AAAA("scorch", "2001:41d0:2:fc4f::1"),
+  A("pyrene", PYRENE_IPV4),
+  AAAA("pyrene", PYRENE_IPV6),
+  A("pyrene.oob", TIAMAT00_INTERNAL),
 
 
-  A("rhaegal", "161.53.248.77"),
+  A("bowser", BOWSER_IPV4),
 
 
-  A("pyrene", "140.211.167.98"),
-  AAAA("pyrene", "2605:bc80:3010:700::8cd3:a762"),
-  A("pyrene.oob", "10.0.0.40"),
+  A("balerion", BALERION_IPV4),
 
 
-  A("bowser", "138.44.68.106"),
+  A("albi", ALBI_IPV4),
+  AAAA("albi", ALBI_IPV6),
 
 
-  CNAME("tile", QUALIFY("tile.geo")),
-  CNAME("a.tile", QUALIFY("tile.geo")),
-  CNAME("b.tile", QUALIFY("tile.geo")),
-  CNAME("c.tile", QUALIFY("tile.geo")),
+  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")),
+  // Fastly DNS based ACME Challenge requirement
+  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
 
   // Services machine
 
 
   // Services machine
 
-  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"),
-
-  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"),
+  A("ironbelly", IRONBELLY_IPV4),
+  AAAA("ironbelly", IRONBELLY_IPV6),
+  A("backup", IRONBELLY_IPV4, TTL("10m")),
+  AAAA("backup", IRONBELLY_IPV6, TTL("10m")),
+  A("planet", IRONBELLY_IPV4, TTL("10m")),
+  AAAA("planet", IRONBELLY_IPV6, TTL("10m")),
+  A("logstash", IRONBELLY_IPV4),
+  AAAA("logstash", IRONBELLY_IPV6),
+  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.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")),
+  // AAAA("backup", GRISU_IPV6, TTL("10m")),
+  // A("planet", GRISU_IPV4, TTL("10m")),
+  // AAAA("planet", GRISU_IPV6, TTL("10m")),
+  A("grisu.bm", GRISU_INTERNAL),
+  A("grisu.oob", GRISU_OOB),
 
   // Database servers
 
 
   // Database servers
 
-  A("karm.ams", "10.0.48.50"),
-  A("karm.oob", "10.0.49.50"),
+  A("snap-01.ams", SNAP01_INTERNAL),
+  A("snap-01.oob", SNAP01_OOB),
+
+  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("eddie.ucl", "10.0.0.10"),
-  A("eddie.oob", "10.0.1.10"),
+  A("karm.ams", KARM_INTERNAL),
+  A("karm.oob", KARM_OOB),
 
 
-  A("katla.bm", "10.0.32.40"),
-  A("katla.oob", "10.0.33.40"),
+  A("eddie.ucl", EDDIE_INTERNAL),
+  A("eddie.oob", EDDIE_OOB),
 
 
-  A("ramoth.ams", "10.0.48.5"),
-  A("ramoth.oob", "10.0.49.5"),
+  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
 
 
   // Development server with wildcard alias for user sites
 
-  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("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),
 
   // Foundation server
 
 
   // Foundation 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"),
+  A("ridley", RIDLEY_IPV4),
+  A("otrs", RIDLEY_IPV4),
+  A("blog", RIDLEY_IPV4),
+  A("foundation", RIDLEY_IPV4),
+  A("hot", RIDLEY_IPV4),
+  A("dmca", RIDLEY_IPV4),
+  A("ridley.ucl", RIDLEY_INTERNAL),
+  A("ridley.oob", RIDLEY_OOB),
 
   // Piwik server
 
 
   // Piwik server
 
-  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"),
+  A("eustace", EUSTACE_IPV4),
+  A("piwik", EUSTACE_IPV4),
+  A("eustace.ucl", EUSTACE_INTERNAL),
+  A("eustace.oob", EUSTACE_OOB),
 
   // Imagery servers
 
 
   // Imagery servers
 
-  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"),
+  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),
 
   // Munin server
 
 
   // 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"),
+  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),
+  AAAA("stormfly-03", STORMFLY03_IPV6),
+  A("prometheus", STORMFLY03_IPV4, TTL("10m")),
+  AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")),
+  A("stormfly-03.oob", STORMFLY03_OOB),
 
   // Chef server
 
 
   // 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"),
+  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),
 
   // Forum server
 
 
   // 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"),
+  A("clifford", CLIFFORD_IPV4),
+  A("forum", CLIFFORD_IPV4, TTL("10m")),
+  A("clifford.ucl", CLIFFORD_INTERNAL),
+  A("clifford.oob", CLIFFORD_OOB),
 
   // KVMs
 
 
   // KVMs
 
-  A("kvm1.ucl", "10.0.0.21"),
+  A("kvm1.ucl", KVM1_INTERNAL),
 
   // Managed network switches
 
 
   // Managed network switches
 
-  A("switch1", "130.117.76.2"),
-  AAAA("switch1", "2001:978:2:2c::172:2"),
+  A("switch1.ams", SWITCH1AMS_IPV4),
+  AAAA("switch1.ams", SWITCH1AMS_IPV6),
+
+  A("switch1.dub", SWITCH1DUB_IPV4),
+  AAAA("switch1.dub", SWITCH1DUB_IPV6),
 
   // Managed power strips
 
 
   // Managed power strips
 
-  A("pdu1.ams", "10.0.48.100"),
-  A("pdu2.ams", "10.0.48.101"),
+  A("pdu1.ams", PDU1AMS_INTERNAL),
+  A("pdu2.ams", PDU2AMS_INTERNAL),
+
+  A("pdu1.dub", PDU1DUB_INTERNAL),
+  A("pdu2.dub", PDU2DUB_INTERNAL),
+
+  // Out of band access servers
+
+  A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
 
 
   // Bytemark machine, and the services which operate from it
 
-  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"),
+  A("shenron", SHENRON_IPV4),
+  AAAA("shenron", SHENRON_IPV6),
+  A("mail", SHENRON_IPV4),
+  AAAA("mail", SHENRON_IPV6),
+  A("mta-sts", SHENRON_IPV4),
+  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),
 
   // Wiki servers
 
 
   // Wiki servers
 
-  A("ouroboros", "130.117.76.4"),
-  AAAA("ouroboros", "2001:978:2:2c::172:4"),
-  // A("wiki", "130.117.76.4", TTL("10m")),
-  // AAAA("wiki", "2001:978:2:2c::172:4", TTL("10m")),
-  A("ouroboros.ams", "10.0.48.4"),
-  A("ouroboros.oob", "10.0.49.4"),
+  A("tabaluga", TABALUGA_IPV4),
+  AAAA("tabaluga", TABALUGA_IPV6),
+  A("wiki", TABALUGA_IPV4, TTL("10m")),
+  AAAA("wiki", TABALUGA_IPV6, TTL("10m")),
+  A("tabaluga.ams", TABALUGA_INTERNAL),
+  A("tabaluga.oob", TABALUGA_OOB),
+
+  // Overpass server
 
 
-  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"),
+  A("gorwen", GORWEN_IPV4),
+  AAAA("gorwen", GORWEN_IPV6),
+  A("query", GORWEN_IPV4, TTL("10m")),
+  AAAA("query", GORWEN_IPV6, TTL("10m")),
+  A("gorwen.dub", GORWEN_INTERNAL),
+  A("gorwen.oob", GORWEN_OOB),
 
   // GPS tile server
 
 
   // GPS tile server
 
-  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"),
+  A("noquiklos", NOQUIKLOS_IPV4),
+  A("gps-tile", NOQUIKLOS_IPV4),
+  A("a.gps-tile", NOQUIKLOS_IPV4),
+  A("b.gps-tile", NOQUIKLOS_IPV4),
+  A("c.gps-tile", NOQUIKLOS_IPV4),
+  A("gps.tile", NOQUIKLOS_IPV4),
+  A("gps-a.tile", NOQUIKLOS_IPV4),
+  A("gps-b.tile", NOQUIKLOS_IPV4),
+  A("gps-c.tile", NOQUIKLOS_IPV4),
+  A("noquiklos.ucl", NOQUIKLOS_INTERNAL),
+  A("noquiklos.oob", NOQUIKLOS_OOB),
 
   // Tile cache servers
 
 
   // 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"),
+  A("gorynych", GORYNYCH_IPV4),
+  AAAA("gorynych", GORYNYCH_IPV6),
+  A("trogdor", TROGDOR_IPV4),
+  A("trogdor.oob", TROGDOR_OOB),
+  A("ridgeback", RIDGEBACK_IPV4),
+  A("ridgeback.oob", RIDGEBACK_OOB),
+  A("nepomuk", NEPOMUK_IPV4),
+  AAAA("nepomuk", NEPOMUK_IPV6),
+  A("viserion", VISERION_IPV4),
+  AAAA("viserion", VISERION_IPV6),
+  A("drogon", DROGON_IPV4),
+  AAAA("drogon", DROGON_IPV6),
+  A("saphira", SAPHIRA_IPV4),
+  AAAA("saphira", SAPHIRA_IPV6),
+  A("toothless", TOOTHLESS_IPV4),
+  AAAA("toothless", TOOTHLESS_IPV6),
+  A("angor", ANGOR_IPV4),
+  // AAAA("angor", ANGOR_IPV6),
+  A("ladon", LADON_IPV4),
+  AAAA("ladon", LADON_IPV6),
+  A("ascalon", ASCALON_IPV4),
+  A("takhisis", TAKHISIS_IPV4),
+  AAAA("takhisis", TAKHISIS_IPV6),
+  A("neak", NEAK_IPV4),
+  A("meraxes", MERAXES_IPV4),
+  AAAA("meraxes", MERAXES_IPV6),
+  A("firnen", FIRNEN_IPV4),
 
   // Blades
 
 
   // 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"),
+  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("lockheed", LOCKHEED_IPV4),
+  AAAA("lockheed", LOCKHEED_IPV6),
+  A("lockheed.ams", LOCKHEED_INTERNAL),
+  A("lockheed.oob", LOCKHEED_OOB),
+
+  // Discourse server ("community")
+  A("jakelong", JAKELONG_IPV4),
+  AAAA("jakelong", JAKELONG_IPV6),
+  A("community", JAKELONG_IPV6),
+  AAAA("community", JAKELONG_IPV6),
+  A("jakelong.dub", JAKELONG_INTERNAL),
+  A("jakelong.oob", JAKELONG_OOB),
 
   // Donation site
 
 
   // Donation site
 
-  A("donate", "193.60.236.19", TTL("10m")),
+  A("donate", RIDLEY_IPV4),
 
   // Uptime site at StatusCake
 
 
   // Uptime site at StatusCake
 
-  CNAME("uptime", "uptimessl.statuscake.com."),
+  CNAME("uptime", "uptimessl-new.statuscake.com."),
 
   // Custom Domain for https://github.com/osmfoundation/welcome-mat/
 
 
   // Custom Domain for https://github.com/osmfoundation/welcome-mat/
 
OpenStreetMap DNS