X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/c9ae1f2330b7c51d74f28df2e35c89f0fe9b8fd3..dab85ec4e3fcc90bf66b120bcc16ff4f1a8f8022:/src/openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 6bef817..b8fa1d6 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -25,12 +25,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("community", 10, QUALIFY("a.mx")),
   MX("supporting", 10, QUALIFY("a.mx")),
 
-  A("a.mx", FAFNIR_IPV4_HE),
-  AAAA("a.mx", FAFNIR_IPV6_HE),
-  A("mail", FAFNIR_IPV4_HE),
-  AAAA("mail", FAFNIR_IPV6_HE),
-  A("mta-sts", FAFNIR_IPV4_HE),
-  AAAA("mta-sts", FAFNIR_IPV6_HE),
+  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
 
@@ -213,95 +213,95 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web servers and their aliases
 
-  A("spike-01", SPIKE01_IPV4_HE),
-  AAAA("spike-01", SPIKE01_IPV6_HE),
-  // A("@", SPIKE01_IPV4_HE),
-  // AAAA("@", SPIKE01_IPV6_HE),
-  // A("www", SPIKE01_IPV4_HE),
-  // AAAA("www", SPIKE01_IPV6_HE),
-  // A("api", SPIKE01_IPV4_HE),
-  // AAAA("api", SPIKE01_IPV6_HE),
-  // A("maps", SPIKE01_IPV4_HE),
-  // AAAA("maps", SPIKE01_IPV6_HE),
-  // A("mapz", SPIKE01_IPV4_HE),
-  // AAAA("mapz", SPIKE01_IPV6_HE),
-  A("spike-01.dub", SPIKE01_INTERNAL),
-  A("spike-01.oob", SPIKE01_OOB),
-
-  A("spike-02", SPIKE02_IPV4_HE),
-  AAAA("spike-02", SPIKE02_IPV6_HE),
-  // A("@", SPIKE02_IPV4_HE),
-  // AAAA("@", SPIKE02_IPV6_HE),
-  // A("www", SPIKE02_IPV4_HE),
-  // AAAA("www", SPIKE02_IPV6_HE),
-  // A("api", SPIKE02_IPV4_HE),
-  // AAAA("api", SPIKE02_IPV6_HE),
-  // A("maps", SPIKE02_IPV4_HE),
-  // AAAA("maps", SPIKE02_IPV6_HE),
-  // A("mapz", SPIKE02_IPV4_HE),
-  // AAAA("mapz", SPIKE02_IPV6_HE),
-  A("spike-02.dub", SPIKE02_INTERNAL),
-  A("spike-02.oob", SPIKE02_OOB),
-
-  A("spike-03", SPIKE03_IPV4_HE),
-  AAAA("spike-03", SPIKE03_IPV6_HE),
-  // A("@", SPIKE03_IPV4_HE),
-  // AAAA("@", SPIKE03_IPV6_HE),
-  // A("www", SPIKE03_IPV4_HE),
-  // AAAA("www", SPIKE03_IPV6_HE),
-  // A("api", SPIKE03_IPV4_HE),
-  // AAAA("api", SPIKE03_IPV6_HE),
-  // A("maps", SPIKE03_IPV4_HE),
-  // AAAA("maps", SPIKE03_IPV6_HE),
-  // A("mapz", SPIKE03_IPV4_HE),
-  // AAAA("mapz", SPIKE03_IPV6_HE),
-  A("spike-03.dub", SPIKE03_INTERNAL),
-  A("spike-03.oob", SPIKE03_OOB),
-
-  A("spike-06", SPIKE06_IPV4),
-  AAAA("spike-06", SPIKE06_IPV6),
-  A("@", SPIKE06_IPV4, 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("@", 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("@", 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-01", IPV4["spike-01.he"]),
+  AAAA("spike-01", IPV6["spike-01.he"]),
+  // 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("spike-01.dub", IPV4["spike-01.dub"]),
+  A("spike-01.oob", IPV4["spike-01.oob"]),
+
+  A("spike-02", IPV4["spike-02.he"]),
+  AAAA("spike-02", IPV6["spike-02.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("spike-02.dub", IPV4["spike-02.dub"]),
+  A("spike-02.oob", IPV4["spike-02.oob"]),
+
+  A("spike-03", IPV4["spike-03.he"]),
+  AAAA("spike-03", IPV6["spike-03.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("spike-03.dub", IPV4["spike-03.dub"]),
+  A("spike-03.oob", IPV4["spike-03.oob"]),
+
+  A("spike-06", IPV4["spike-06"]),
+  AAAA("spike-06", IPV6["spike-06"]),
+  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("spike-06.ams", IPV4["spike-06.ams"]),
+  A("spike-06.oob", IPV4["spike-06.oob"]),
+
+  A("spike-07", IPV4["spike-07"]),
+  AAAA("spike-07", IPV6["spike-07"]),
+  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("spike-07.ams", IPV4["spike-07.ams"]),
+  A("spike-07.oob", IPV4["spike-07.oob"]),
+
+  A("spike-08", IPV4["spike-08"]),
+  AAAA("spike-08", IPV6["spike-08"]),
+  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),
+  A("spike-08.ams", IPV4["spike-08.ams"]),
+  A("spike-08.oob", IPV4["spike-08.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("www", 1, ".", "alpn=h2"),
@@ -311,24 +311,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Nominatim servers
 
-  A("dulcy", DULCY_IPV4),
-  AAAA("dulcy", DULCY_IPV6),
-  A("dulcy.ams", DULCY_INTERNAL),
-  A("dulcy.oob", DULCY_OOB),
+  A("dulcy", IPV4["dulcy"]),
+  AAAA("dulcy", IPV6["dulcy"]),
+  A("dulcy.ams", IPV4["dulcy.ams"]),
+  A("dulcy.oob", IPV4["dulcy.oob"]),
 
-  A("longma", LONGMA_IPV4_HE),
-  AAAA("longma", LONGMA_IPV6_HE),
-  A("longma.dub", LONGMA_INTERNAL),
-  A("longma.oob", LONGMA_OOB),
+  A("longma", IPV4["longma.he"]),
+  AAAA("longma", IPV6["longma.he"]),
+  A("longma.dub", IPV4["longma.dub"]),
+  A("longma.oob", IPV4["longma.oob"]),
 
-  A("stormfly-04", STORMFLY04_IPV4),
-  AAAA("stormfly-04", STORMFLY04_IPV6),
-  A("stormfly-04.oob", STORMFLY04_OOB),
+  A("stormfly-04", IPV4["stormfly-04"]),
+  AAAA("stormfly-04", IPV6["stormfly-04"]),
+  A("stormfly-04.oob", IPV4["stormfly-04.oob"]),
 
-  A("vhagar", VHAGAR_IPV4),
-  AAAA("vhagar", VHAGAR_IPV6),
-  A("vhagar.ams", VHAGAR_INTERNAL),
-  A("vhagar.oob", VHAGAR_OOB),
+  A("vhagar", IPV4["vhagar"]),
+  AAAA("vhagar", IPV6["vhagar"]),
+  A("vhagar.ams", IPV4["vhagar.ams"]),
+  A("vhagar.oob", IPV4["vhagar.oob"]),
 
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
@@ -336,134 +336,134 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Tile servers
 
-  A("odin", ODIN_IPV4),
-  AAAA("odin", ODIN_IPV6),
-  A("odin.ams", ODIN_INTERNAL),
-  A("odin.oob", ODIN_OOB),
+  A("odin", IPV4["odin"]),
+  AAAA("odin", IPV6["odin"]),
+  A("odin.ams", IPV4["odin.ams"]),
+  A("odin.oob", IPV4["odin.oob"]),
 
-  A("ysera", YSERA_IPV4),
-  A("ysera.ucl", YSERA_INTERNAL),
-  A("ysera.oob", YSERA_OOB),
+  A("ysera", IPV4["ysera"]),
+  A("ysera.ucl", IPV4["ysera.ucl"]),
+  A("ysera.oob", IPV4["ysera.oob"]),
 
-  A("culebre", CULEBRE_IPV4_HE),
-  AAAA("culebre", CULEBRE_IPV6_HE),
-  A("culebre.dub", CULEBRE_INTERNAL),
-  A("culebre.oob", CULEBRE_OOB),
+  A("culebre", IPV4["culebre.he"]),
+  AAAA("culebre", IPV6["culebre.he"]),
+  A("culebre.dub", IPV4["culebre.dub"]),
+  A("culebre.oob", IPV4["culebre.oob"]),
 
-  A("nidhogg", NIDHOGG_IPV4),
-  AAAA("nidhogg", NIDHOGG_IPV6),
-  A("nidhogg.oob", NIDHOGG_OOB),
+  A("nidhogg", IPV4["nidhogg"]),
+  AAAA("nidhogg", IPV6["nidhogg"]),
+  A("nidhogg.oob", IPV4["nidhogg.oob"]),
 
-  A("wawel", WAWEL_IPV4),
+  A("wawel", IPV4["wawel"]),
 
-  A("rhaegal", RHAEGAL_IPV4),
-  AAAA("rhaegal", RHAEGAL_IPV6),
+  A("rhaegal", IPV4["rhaegal"]),
+  AAAA("rhaegal", IPV6["rhaegal"]),
 
-  A("palulukon", PALULUKON_IPV4),
+  A("palulukon", IPV4["palulukon"]),
 
-  A("piasa", PIASA_IPV4),
-  AAAA("piasa", PIASA_IPV6),
-  A("piasa.oob", PIASA_OOB),
+  A("piasa", IPV4["piasa"]),
+  AAAA("piasa", IPV6["piasa"]),
+  A("piasa.oob", IPV4["piasa.oob"]),
 
-  A("albi", ALBI_IPV4),
-  AAAA("albi", ALBI_IPV6),
+  A("albi", IPV4["albi"]),
+  AAAA("albi", IPV6["albi"]),
 
   CNAME("tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("a.tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("b.tile", "dualstack.n.sni.global.fastly.net."),
   CNAME("c.tile", "dualstack.n.sni.global.fastly.net."),
 
-  A("render", CULEBRE_IPV4_HE),
-  A("render", NIDHOGG_IPV4),
-  AAAA("render", CULEBRE_IPV6_HE),
-  AAAA("render", NIDHOGG_IPV6),
+  A("render", IPV4["culebre.he"]),
+  A("render", IPV4["nidhogg"]),
+  AAAA("render", IPV6["culebre.he"]),
+  AAAA("render", IPV6["nidhogg"]),
 
   // Vector tile servers
 
-  A("cmok", CMOK_IPV4),
+  A("cmok", IPV4["cmok"]),
 
-  A("dribble", DRIBBLE_IPV4),
-  AAAA("dribble", DRIBBLE_IPV6),
-  A("dribble.ams", DRIBBLE_INTERNAL),
-  A("dribble.oob", DRIBBLE_OOB),
+  A("dribble", IPV4["dribble"]),
+  AAAA("dribble", IPV6["dribble"]),
+  A("dribble.ams", IPV4["dribble.ams"]),
+  A("dribble.oob", IPV4["dribble.oob"]),
 
   CNAME("vector", "dualstack.n.sni.global.fastly.net."),
 
   // Site gateways
 
-  A("fafnir", FAFNIR_IPV4_HE),
-  AAAA("fafnir", FAFNIR_IPV6_HE),
-  A("fafnir.dub", FAFNIR_INTERNAL),
-  A("fafnir.oob", FAFNIR_OOB),
+  A("fafnir", IPV4["fafnir.he"]),
+  AAAA("fafnir", IPV6["fafnir.he"]),
+  A("fafnir.dub", IPV4["fafnir.dub"]),
+  A("fafnir.oob", IPV4["fafnir.oob"]),
 
   // Planet servers
 
-  A("norbert", NORBERT_IPV4),
-  AAAA("norbert", NORBERT_IPV6),
-  A("backup", NORBERT_IPV4),
-  AAAA("backup", NORBERT_IPV6),
-  A("planet", NORBERT_IPV4),
-  AAAA("planet", NORBERT_IPV6),
-  A("norbert.ams", NORBERT_INTERNAL),
-  A("norbert.oob", NORBERT_OOB),
+  A("norbert", IPV4["norbert"]),
+  AAAA("norbert", IPV6["norbert"]),
+  A("backup", IPV4["norbert"]),
+  AAAA("backup", IPV6["norbert"]),
+  A("planet", IPV4["norbert"]),
+  AAAA("planet", IPV6["norbert"]),
+  A("norbert.ams", IPV4["norbert.ams"]),
+  A("norbert.oob", IPV4["norbert.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("planet", 1, ".", "alpn=h2"),
 
-  A("horntail", HORNTAIL_IPV4_HE),
-  AAAA("horntail", HORNTAIL_IPV6_HE),
-  // A("backup", HORNTAIL_IPV4_HE),
-  // AAAA("backup", HORNTAIL_IPV6_HE),
-  // A("planet", HORNTAIL_IPV4_HE),
-  // AAAA("planet", HORNTAIL_IPV6_HE),
-  A("horntail.dub", HORNTAIL_INTERNAL),
-  A("horntail.oob", HORNTAIL_OOB),
+  A("horntail", IPV4["horntail.he"]),
+  AAAA("horntail", IPV6["horntail.he"]),
+  // A("backup", IPV4["horntail.he"]),
+  // AAAA("backup", IPV6["horntail.he"]),
+  // A("planet", IPV4["horntail.he"]),
+  // AAAA("planet", IPV6["horntail.he"]),
+  A("horntail.dub", IPV4["horntail.dub"]),
+  A("horntail.oob", IPV4["horntail.oob"]),
 
   // Database servers
 
-  A("snap-01.ams", SNAP01_INTERNAL),
-  A("snap-01.oob", SNAP01_OOB),
+  A("snap-01.ams", IPV4["snap-01.ams"]),
+  A("snap-01.oob", IPV4["snap-01.oob"]),
 
-  A("snap-02.ucl", SNAP02_INTERNAL),
-  A("snap-02.oob", SNAP02_OOB),
+  A("snap-02.ucl", IPV4["snap-02.ucl"]),
+  A("snap-02.oob", IPV4["snap-02.oob"]),
 
-  A("snap-03.dub", SNAP03_INTERNAL),
-  A("snap-03.oob", SNAP03_OOB),
+  A("snap-03.dub", IPV4["snap-03.dub"]),
+  A("snap-03.oob", IPV4["snap-03.oob"]),
 
-  A("karm.ams", KARM_INTERNAL),
-  A("karm.oob", KARM_OOB),
+  A("karm.ams", IPV4["karm.ams"]),
+  A("karm.oob", IPV4["karm.oob"]),
 
-  A("eddie.ucl", EDDIE_INTERNAL),
-  A("eddie.oob", EDDIE_OOB),
+  A("eddie.ucl", IPV4["eddie.ucl"]),
+  A("eddie.oob", IPV4["eddie.oob"]),
 
   // Development server with wildcard alias for user sites
 
-  A("faffy", FAFFY_IPV4),
-  AAAA("faffy", FAFFY_IPV6),
-  A("dev", FAFFY_IPV4),
-  AAAA("dev", FAFFY_IPV6),
-  A("*.dev", FAFFY_IPV4),
-  AAAA("*.dev", FAFFY_IPV6),
-  A("ooc", FAFFY_IPV4),
-  AAAA("ooc", FAFFY_IPV6),
-  A("a.ooc", FAFFY_IPV4),
-  AAAA("a.ooc", FAFFY_IPV6),
-  A("b.ooc", FAFFY_IPV4),
-  AAAA("b.ooc", FAFFY_IPV6),
-  A("c.ooc", FAFFY_IPV4),
-  AAAA("c.ooc", FAFFY_IPV6),
-  A("npe", FAFFY_IPV4),
-  AAAA("npe", FAFFY_IPV6),
-  A("faffy.ams", FAFFY_INTERNAL),
-  A("faffy.oob", FAFFY_OOB),
+  A("faffy", IPV4["faffy"]),
+  AAAA("faffy", IPV6["faffy"]),
+  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("faffy.ams", IPV4["faffy.ams"]),
+  A("faffy.oob", IPV4["faffy.oob"]),
 
   // Foundation server
 
-  A("ridley", RIDLEY_IPV4),
-  A("blog", RIDLEY_IPV4),
-  A("foundation", RIDLEY_IPV4),
-  A("ridley.ucl", RIDLEY_INTERNAL),
-  A("ridley.oob", RIDLEY_OOB),
+  A("ridley", IPV4["ridley"]),
+  A("blog", IPV4["ridley"]),
+  A("foundation", IPV4["ridley"]),
+  A("ridley.ucl", IPV4["ridley.ucl"]),
+  A("ridley.oob", IPV4["ridley.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("blog", 1, ".", "alpn=h2"),
@@ -471,14 +471,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Matomo server
 
-  A("smaug", SMAUG_IPV4_HE),
-  AAAA("smaug", SMAUG_IPV6_HE),
-  A("matomo", SMAUG_IPV4_HE),
-  AAAA("matomo", SMAUG_IPV6_HE),
-  A("piwik", SMAUG_IPV4_HE),
-  AAAA("piwik", SMAUG_IPV6_HE),
-  A("smaug.dub", SMAUG_INTERNAL),
-  A("smaug.oob", SMAUG_OOB),
+  A("smaug", IPV4["smaug.he"]),
+  AAAA("smaug", IPV6["smaug.he"]),
+  A("matomo", IPV4["smaug.he"]),
+  AAAA("matomo", IPV6["smaug.he"]),
+  A("piwik", IPV4["smaug.he"]),
+  AAAA("piwik", IPV6["smaug.he"]),
+  A("smaug.dub", IPV4["smaug.dub"]),
+  A("smaug.oob", IPV4["smaug.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("matomo", 1, ".", "alpn=h2"),
@@ -486,14 +486,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Imagery servers
 
-  A("agri", LOCKHEED_IPV4),
-  AAAA("agri", LOCKHEED_IPV6),
-  A("a.agri", LOCKHEED_IPV4),
-  AAAA("a.agri", LOCKHEED_IPV6),
-  A("b.agri", LOCKHEED_IPV4),
-  AAAA("b.agri", LOCKHEED_IPV6),
-  A("c.agri", LOCKHEED_IPV4),
-  AAAA("c.agri", LOCKHEED_IPV6),
+  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 / SVCB records
   HTTPS("agri", 1, ".", "alpn=h2"),
@@ -501,14 +501,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("b.agri", 1, ".", "alpn=h2"),
   HTTPS("c.agri", 1, ".", "alpn=h2"),
 
-  A("os", LOCKHEED_IPV4),
-  AAAA("os", LOCKHEED_IPV6),
-  A("a.os", LOCKHEED_IPV4),
-  AAAA("a.os", LOCKHEED_IPV6),
-  A("b.os", LOCKHEED_IPV4),
-  AAAA("b.os", LOCKHEED_IPV6),
-  A("c.os", LOCKHEED_IPV4),
-  AAAA("c.os", LOCKHEED_IPV6),
+  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 / SVCB records
   HTTPS("os", 1, ".", "alpn=h2"),
@@ -519,13 +519,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Prometheus server and munin redirect
 
-  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", IPV4["stormfly-03"]),
+  AAAA("stormfly-03", IPV6["stormfly-03"]),
+  A("prometheus", IPV4["stormfly-03"]),
+  AAAA("prometheus", IPV6["stormfly-03"]),
+  A("munin", IPV4["stormfly-03"]),
+  AAAA("munin", IPV6["stormfly-03"]),
+  A("stormfly-03.oob", IPV4["stormfly-03.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("prometheus", 1, ".", "alpn=h2"),
@@ -533,22 +533,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Management server
 
-  A("idris", IDRIS_IPV4_HE),
-  AAAA("idris", IDRIS_IPV6_HE),
-  A("acme", IDRIS_IPV4_HE),
-  AAAA("acme", IDRIS_IPV6_HE),
-  A("apt", IDRIS_IPV4_HE),
-  AAAA("apt", IDRIS_IPV6_HE),
-  A("chef", IDRIS_IPV4_HE),
-  AAAA("chef", IDRIS_IPV6_HE),
-  A("dns", IDRIS_IPV4_HE),
-  AAAA("dns", IDRIS_IPV6_HE),
-  A("git", IDRIS_IPV4_HE),
-  AAAA("git", IDRIS_IPV6_HE),
-  A("hardware", IDRIS_IPV4_HE),
-  AAAA("hardware", IDRIS_IPV6_HE),
-  A("idris.dub", IDRIS_INTERNAL),
-  A("idris.oob", IDRIS_OOB),
+  A("idris", IPV4["idris.he"]),
+  AAAA("idris", IPV6["idris.he"]),
+  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("idris.dub", IPV4["idris.dub"]),
+  A("idris.oob", IPV4["idris.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("acme", 1, ".", "alpn=h2"),
@@ -559,54 +559,54 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Managed network switches
 
-  A("switch1.ams", SWITCH1AMS_IPV4),
-  AAAA("switch1.ams", SWITCH1AMS_IPV6),
+  A("switch1.ams", IPV4["switch1.ams"]),
+  AAAA("switch1.ams", IPV6["switch1.ams"]),
 
-  A("switch1.dub", SWITCH1DUB_IPV4_HE),
-  AAAA("switch1.dub", SWITCH1DUB_IPV6_HE),
+  A("switch1.dub", IPV4["switch1.he.dub"]),
+  AAAA("switch1.dub", IPV6["switch1.he.dub"]),
 
   // Managed power strips
 
-  A("pdu1.ams", PDU1AMS_INTERNAL),
-  A("pdu2.ams", PDU2AMS_INTERNAL),
+  A("pdu1.ams", IPV4["pdu1.ams"]),
+  A("pdu2.ams", IPV4["pdu2.ams"]),
 
-  A("pdu1.dub", PDU1DUB_INTERNAL),
-  A("pdu2.dub", PDU2DUB_INTERNAL),
+  A("pdu1.dub", IPV4["pdu1.dub"]),
+  A("pdu2.dub", IPV4["pdu2.dub"]),
 
   // Out of band access servers
 
-  A("oob1.ams", OOB1AMS_INTERNAL),
+  A("oob1.ams", IPV4["oob1.ams"]),
 
-  A("oob1.dub", OOB1DUB_INTERNAL),
+  A("oob1.dub", IPV4["oob1.dub"]),
 
   // Network gateways
 
-  A("equinix-gw.ams", EQUINIXGWAMS_IPV4),
-  AAAA("equinix-gw.ams", EQUINIXGWAMS_IPV6),
-  A("equinix-gw-1.ams", EQUINIXGW1AMS_IPV4),
-  AAAA("equinix-gw-1.ams", EQUINIXGW1AMS_IPV6),
-  A("equinix-gw-2.ams", EQUINIXGW2AMS_IPV4),
-  AAAA("equinix-gw-2.ams", EQUINIXGW2AMS_IPV6),
-  A("equinix-osm.ams", EQUINIXOSMAMS_IPV4),
-  AAAA("equinix-osm.ams", EQUINIXOSMAMS_IPV6),
-
-  A("equinix-gw.dub", EQUINIXGWDUB_IPV4),
-  AAAA("equinix-gw.dub", EQUINIXGWDUB_IPV6),
-  A("equinix-gw-1.dub", EQUINIXGW1DUB_IPV4),
-  AAAA("equinix-gw-1.dub", EQUINIXGW1DUB_IPV6),
-  A("equinix-gw-2.dub", EQUINIXGW2DUB_IPV4),
-  AAAA("equinix-gw-2.dub", EQUINIXGW2DUB_IPV6),
-  A("equinix-osm.dub", EQUINIXOSMDUB_IPV4),
-  AAAA("equinix-osm.dub", EQUINIXOSMDUB_IPV6),
+  A("equinix-gw.ams", IPV4["equinix-gw.ams"]),
+  AAAA("equinix-gw.ams", IPV6["equinix-gw.ams"]),
+  A("equinix-gw-1.ams", IPV4["equinix-gw-1.ams"]),
+  AAAA("equinix-gw-1.ams", IPV6["equinix-gw-1.ams"]),
+  A("equinix-gw-2.ams", IPV4["equinix-gw-2.ams"]),
+  AAAA("equinix-gw-2.ams", IPV6["equinix-gw-2.ams"]),
+  A("equinix-osm.ams", IPV4["equinix-osm.ams"]),
+  AAAA("equinix-osm.ams", IPV6["equinix-osm.ams"]),
+
+  A("equinix-gw.dub", IPV4["equinix-gw.dub"]),
+  AAAA("equinix-gw.dub", IPV6["equinix-gw.dub"]),
+  A("equinix-gw-1.dub", IPV4["equinix-gw-1.dub"]),
+  AAAA("equinix-gw-1.dub", IPV6["equinix-gw-1.dub"]),
+  A("equinix-gw-2.dub", IPV4["equinix-gw-2.dub"]),
+  AAAA("equinix-gw-2.dub", IPV6["equinix-gw-2.dub"]),
+  A("equinix-osm.dub", IPV4["equinix-osm.dub"]),
+  AAAA("equinix-osm.dub", IPV6["equinix-osm.dub"]),
 
   // Bytemark machine, and the services which operate from it
 
-  A("shenron", SHENRON_IPV4),
-  AAAA("shenron", SHENRON_IPV6),
-  A("lists", SHENRON_IPV4),
-  AAAA("lists", SHENRON_IPV6),
-  A("help", SHENRON_IPV4),
-  AAAA("help", SHENRON_IPV6),
+  A("shenron", IPV4["shenron"]),
+  AAAA("shenron", IPV6["shenron"]),
+  A("lists", IPV4["shenron"]),
+  AAAA("lists", IPV6["shenron"]),
+  A("help", IPV4["shenron"]),
+  AAAA("help", IPV6["shenron"]),
 
   // HTTPS / SVCB records
   HTTPS("lists", 1, ".", "alpn=h2"),
@@ -614,28 +614,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Naga service
 
-  A("naga", NAGA_IPV4_HE),
-  AAAA("naga", NAGA_IPV6_HE),
-  A("svn", NAGA_IPV4_HE),
-  AAAA("svn", NAGA_IPV6_HE),
-  A("trac", NAGA_IPV4_HE),
-  AAAA("trac", NAGA_IPV6_HE),
-  A("irc", NAGA_IPV4_HE),
-  AAAA("irc", NAGA_IPV6_HE),
-  A("blogs", NAGA_IPV4_HE),
-  AAAA("blogs", NAGA_IPV6_HE),
-  A("welcome", NAGA_IPV4_HE),
-  AAAA("welcome", NAGA_IPV6_HE),
-  A("operations", NAGA_IPV4_HE),
-  AAAA("operations", NAGA_IPV6_HE),
-  A("hot", NAGA_IPV4_HE),
-  AAAA("hot", NAGA_IPV6_HE),
-  A("dmca", NAGA_IPV4_HE),
-  AAAA("dmca", NAGA_IPV6_HE),
-  A("otrs", NAGA_IPV4_HE),
-  AAAA("otrs", NAGA_IPV6_HE),
-  A("birthday20", NAGA_IPV4_HE),
-  AAAA("birthday20", NAGA_IPV6_HE),
+  A("naga", IPV4["naga.he"]),
+  AAAA("naga", IPV6["naga.he"]),
+  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"]),
 
   // HTTPS / SVCB records
   HTTPS("svn", 1, ".", "alpn=h2"),
@@ -649,55 +649,55 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   // 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", IPV4["naga.dub"]),
+  A("naga.oob", IPV4["naga.oob"]),
 
   // Wiki servers
 
-  A("konqi", KONQI_IPV4_HE),
-  AAAA("konqi", KONQI_IPV6_HE),
-  A("wiki", KONQI_IPV4_HE),
-  AAAA("wiki", KONQI_IPV6_HE),
-  A("konqi.dub", KONQI_INTERNAL),
-  A("konqi.oob", KONQI_OOB),
+  A("konqi", IPV4["konqi.he"]),
+  AAAA("konqi", IPV6["konqi.he"]),
+  A("wiki", IPV4["konqi.he"]),
+  AAAA("wiki", IPV6["konqi.he"]),
+  A("konqi.dub", IPV4["konqi.dub"]),
+  A("konqi.oob", IPV4["konqi.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("wiki", 1, ".", "alpn=h2"),
 
   // Overpass server
 
-  A("grisu", GRISU_IPV4_HE),
-  AAAA("grisu", GRISU_IPV6_HE),
-  A("query", GRISU_IPV4_HE),
-  AAAA("query", GRISU_IPV6_HE),
-  A("grisu.dub", GRISU_INTERNAL),
-  A("grisu.oob", GRISU_OOB),
+  A("grisu", IPV4["grisu.he"]),
+  AAAA("grisu", IPV6["grisu.he"]),
+  A("query", IPV4["grisu.he"]),
+  AAAA("query", IPV6["grisu.he"]),
+  A("grisu.dub", IPV4["grisu.dub"]),
+  A("grisu.oob", IPV4["grisu.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("query", 1, ".", "alpn=h2"),
 
   // GPS tile server
 
-  A("muirdris", MUIRDRIS_IPV4_HE),
-  AAAA("muirdris", MUIRDRIS_IPV6_HE),
-  A("gps-tile", MUIRDRIS_IPV4_HE),
-  AAAA("gps-tile", MUIRDRIS_IPV6_HE),
-  A("a.gps-tile", MUIRDRIS_IPV4_HE),
-  AAAA("a.gps-tile", MUIRDRIS_IPV6_HE),
-  A("b.gps-tile", MUIRDRIS_IPV4_HE),
-  AAAA("b.gps-tile", MUIRDRIS_IPV6_HE),
-  A("c.gps-tile", MUIRDRIS_IPV4_HE),
-  AAAA("c.gps-tile", MUIRDRIS_IPV6_HE),
-  A("gps.tile", MUIRDRIS_IPV4_HE),
-  AAAA("gps.tile", MUIRDRIS_IPV6_HE),
-  A("gps-a.tile", MUIRDRIS_IPV4_HE),
-  AAAA("gps-a.tile", MUIRDRIS_IPV6_HE),
-  A("gps-b.tile", MUIRDRIS_IPV4_HE),
-  AAAA("gps-b.tile", MUIRDRIS_IPV6_HE),
-  A("gps-c.tile", MUIRDRIS_IPV4_HE),
-  AAAA("gps-c.tile", MUIRDRIS_IPV6_HE),
-  A("muirdris.dub", MUIRDRIS_INTERNAL),
-  A("muirdris.oob", MUIRDRIS_OOB),
+  A("muirdris", IPV4["muirdris.he"]),
+  AAAA("muirdris", IPV6["muirdris.he"]),
+  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("muirdris.dub", IPV4["muirdris.dub"]),
+  A("muirdris.oob", IPV4["muirdris.oob"]),
 
   // HTTPS / SVCB records
   HTTPS("gps-tile", 1, ".", "alpn=h2"),
@@ -710,41 +710,41 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Tile cache servers
 
-  A("ridgeback", RIDGEBACK_IPV4),
-  A("ridgeback.oob", RIDGEBACK_OOB),
-  A("angor", ANGOR_IPV4),
-  AAAA("angor", ANGOR_IPV6),
-  A("ladon", LADON_IPV4),
-  AAAA("ladon", LADON_IPV6),
-  A("neak", NEAK_IPV4),
-  A("meraxes", MERAXES_IPV4),
-  AAAA("meraxes", MERAXES_IPV6),
+  A("ridgeback", IPV4["ridgeback"]),
+  A("ridgeback.oob", IPV4["ridgeback.oob"]),
+  A("angor", IPV4["angor"]),
+  AAAA("angor", IPV6["angor"]),
+  A("ladon", IPV4["ladon"]),
+  AAAA("ladon", IPV6["ladon"]),
+  A("neak", IPV4["neak"]),
+  A("meraxes", IPV4["meraxes"]),
+  AAAA("meraxes", IPV6["meraxes"]),
 
   // Donation site and new OSMF crm site
 
-  A("donate", RIDLEY_IPV4),
-  A("support", RIDLEY_IPV4),
-  A("supporting", RIDLEY_IPV4),
+  A("donate", IPV4["ridley"]),
+  A("support", IPV4["ridley"]),
+  A("supporting", IPV4["ridley"]),
 
   // 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),
+  A("lockheed", IPV4["lockheed"]),
+  AAAA("lockheed", IPV6["lockheed"]),
+  A("lockheed.ams", IPV4["lockheed.ams"]),
+  A("lockheed.oob", IPV4["lockheed.oob"]),
+  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"]),
 
   // HTTPS / SVCB records
   HTTPS("tiler", 1, ".", "alpn=h2"),
@@ -755,17 +755,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Discourse server ("community")
 
-  A("fume", FUME_IPV4_HE),
-  AAAA("fume", FUME_IPV6_HE),
-  A("fume.dub", FUME_INTERNAL),
-  A("fume.oob", FUME_OOB),
+  A("fume", IPV4["fume.he"]),
+  AAAA("fume", IPV6["fume.he"]),
+  A("fume.dub", IPV4["fume.dub"]),
+  A("fume.oob", IPV4["fume.oob"]),
 
-  A("community", FUME_IPV4_HE),
-  A("communities", FUME_IPV4_HE),
-  A("c", FUME_IPV4_HE),
-  AAAA("community", FUME_IPV6_HE),
-  AAAA("communities", FUME_IPV6_HE),
-  AAAA("c", FUME_IPV6_HE),
+  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"]),
 
   // HTTPS / SVCB records
   HTTPS("community", 1, ".", "alpn=h2"),
@@ -775,27 +775,27 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
 
-  A("forum", FUME_IPV4_HE),
-  AAAA("forum", FUME_IPV6_HE),
+  A("forum", IPV4["fume.he"]),
+  AAAA("forum", IPV6["fume.he"]),
 
   // 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("tabaluga", IPV4["tabaluga"]),
+  AAAA("tabaluga", IPV6["tabaluga"]),
+  A("tabaluga.ams", IPV4["tabaluga.ams"]),
+  A("tabaluga.oob", IPV4["tabaluga.oob"]),
 
-  A("staging.blog", TABALUGA_IPV4),
-  AAAA("staging.blog", TABALUGA_IPV6),
+  A("staging.blog", IPV4["tabaluga"]),
+  AAAA("staging.blog", IPV6["tabaluga"]),
 
   // HTTPS / SVCB records
   HTTPS("staging.blog", 1, ".", "alpn=h2"),
 
-  A("taginfo", TABALUGA_IPV4),
-  AAAA("taginfo", TABALUGA_IPV6),
+  A("taginfo", IPV4["tabaluga"]),
+  AAAA("taginfo", IPV6["tabaluga"]),
 
   // HTTPS / SVCB records
   HTTPS("taginfo", 1, ".", "alpn=h2"),