X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/76db129f1785dae9c81ccdc04b304c07e5beba30..5313824eeb3ee00b0ac1e360c8bf057dd0f74b46:/src/openstreetmap.js?ds=sidebyside diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 58310c0..45df0a0 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), - AAAA("a.mx", FAFNIR_IPV6), - A("mail", FAFNIR_IPV4), - AAAA("mail", FAFNIR_IPV6), - A("mta-sts", FAFNIR_IPV4), - AAAA("mta-sts", FAFNIR_IPV6), + 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 @@ -38,14 +38,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "@", parts: [ "v=spf1", - "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 - "mx", // safety net if we change mx + "ip4:184.104.226.98", // fafnir ipv4 (he.net) + "ip6:2001:470:1:b3b::2", // fafnir ipv6 (he.net) + "ip4:87.252.214.98", // fafnir ipv4 (equinix) + "ip6:2001:4d78:fe03:1c::2", // fafnir ipv6 (equinix) + "ip4:193.60.236.0/24", // ucl external + "ip4:82.199.86.96/27", // amsterdam external (equinix) + "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix) + "ip4:87.252.214.96/27", // dublin external (equinix) + "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix) + "ip4:184.104.179.128/27", // amsterdam external (he.net) + "ip6:2001:470:1:fa1::/64", // amsterdam external (he.net) + "ip4:184.104.226.96/27", // dublin external (he.net) + "ip6:2001:470:1:b3b::/64", // dublin external (he.net) + "mx", // safety net if we change mx "-all" ] }), @@ -54,14 +60,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "messages", parts: [ "v=spf1", - "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 - "mx", // safety net if we change mx + "ip4:184.104.226.98", // fafnir ipv4 (he.net) + "ip6:2001:470:1:b3b::2", // fafnir ipv6 (he.net) + "ip4:87.252.214.98", // fafnir ipv4 (equinix) + "ip6:2001:4d78:fe03:1c::2", // fafnir ipv6 (equinix) + "ip4:193.60.236.0/24", // ucl external + "ip4:82.199.86.96/27", // amsterdam external (equinix) + "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix) + "ip4:87.252.214.96/27", // dublin external (equinix) + "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix) + "ip4:184.104.179.128/27", // amsterdam external (he.net) + "ip6:2001:470:1:fa1::/64", // amsterdam external (he.net) + "ip4:184.104.226.96/27", // dublin external (he.net) + "ip6:2001:470:1:b3b::/64", // dublin external (he.net) + "mx", // safety net if we change mx "-all" ] }), @@ -70,14 +82,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "noreply", parts: [ "v=spf1", - "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 - "mx", // safety net if we change mx + "ip4:184.104.226.98", // fafnir ipv4 (he.net) + "ip6:2001:470:1:b3b::2", // fafnir ipv6 (he.net) + "ip4:87.252.214.98", // fafnir ipv4 (equinix) + "ip6:2001:4d78:fe03:1c::2", // fafnir ipv6 (equinix) + "ip4:193.60.236.0/24", // ucl external + "ip4:82.199.86.96/27", // amsterdam external (equinix) + "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix) + "ip4:87.252.214.96/27", // dublin external (equinix) + "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix) + "ip4:184.104.179.128/27", // amsterdam external (he.net) + "ip6:2001:470:1:fa1::/64", // amsterdam external (he.net) + "ip4:184.104.226.96/27", // dublin external (he.net) + "ip6:2001:470:1:b3b::/64", // dublin external (he.net) + "mx", // safety net if we change mx "-all" ] }), @@ -86,14 +104,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "otrs", parts: [ "v=spf1", - "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 - "mx", // safety net if we change mx + "ip4:184.104.226.98", // fafnir ipv4 (he.net) + "ip6:2001:470:1:b3b::2", // fafnir ipv6 (he.net) + "ip4:87.252.214.98", // fafnir ipv4 (equinix) + "ip6:2001:4d78:fe03:1c::2", // fafnir ipv6 (equinix) + "ip4:193.60.236.0/24", // ucl external + "ip4:82.199.86.96/27", // amsterdam external (equinix) + "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix) + "ip4:87.252.214.96/27", // dublin external (equinix) + "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix) + "ip4:184.104.179.128/27", // amsterdam external (he.net) + "ip6:2001:470:1:fa1::/64", // amsterdam external (he.net) + "ip4:184.104.226.96/27", // dublin external (he.net) + "ip6:2001:470:1:b3b::/64", // dublin external (he.net) + "mx", // safety net if we change mx "-all" ] }), @@ -102,14 +126,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "community", parts: [ "v=spf1", - "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 - "mx", // safety net if we change mx + "ip4:184.104.226.98", // fafnir ipv4 (he.net) + "ip6:2001:470:1:b3b::2", // fafnir ipv6 (he.net) + "ip4:87.252.214.98", // fafnir ipv4 (equinix) + "ip6:2001:4d78:fe03:1c::2", // fafnir ipv6 (equinix) + "ip4:193.60.236.0/24", // ucl external + "ip4:82.199.86.96/27", // amsterdam external (equinix) + "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix) + "ip4:87.252.214.96/27", // dublin external (equinix) + "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix) + "ip4:184.104.179.128/27", // amsterdam external (he.net) + "ip6:2001:470:1:fa1::/64", // amsterdam external (he.net) + "ip4:184.104.226.96/27", // dublin external (he.net) + "ip6:2001:470:1:b3b::/64", // dublin external (he.net) + "mx", // safety net if we change mx "-all" ] }), @@ -118,14 +148,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "supporting", parts: [ "v=spf1", - "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 - "mx", // safety net if we change mx + "ip4:184.104.226.98", // fafnir ipv4 (he.net) + "ip6:2001:470:1:b3b::2", // fafnir ipv6 (he.net) + "ip4:87.252.214.98", // fafnir ipv4 (equinix) + "ip6:2001:4d78:fe03:1c::2", // fafnir ipv6 (equinix) + "ip4:193.60.236.0/24", // ucl external + "ip4:82.199.86.96/27", // amsterdam external (equinix) + "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix) + "ip4:87.252.214.96/27", // dublin external (equinix) + "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix) + "ip4:184.104.179.128/27", // amsterdam external (he.net) + "ip6:2001:470:1:fa1::/64", // amsterdam external (he.net) + "ip4:184.104.226.96/27", // dublin external (he.net) + "ip6:2001:470:1:b3b::/64", // dublin external (he.net) + "mx", // safety net if we change mx "-all" ] }), @@ -177,122 +213,78 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web servers and their aliases - A("spike-01", SPIKE01_IPV4), - AAAA("spike-01", SPIKE01_IPV6), - 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), - 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), - 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-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), - - // 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), - AAAA("dulcy", DULCY_IPV6), - 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("@", IPV4["spike-01.he"]), + // AAAA("@", IPV6["spike-01.he"]), + // A("www", IPV4["spike-01.he"]), + // AAAA("www", IPV6["spike-01.he"]), + // A("api", IPV4["spike-01.he"]), + // AAAA("api", IPV6["spike-01.he"]), + // A("maps", IPV4["spike-01.he"]), + // AAAA("maps", IPV6["spike-01.he"]), + // A("mapz", IPV4["spike-01.he"]), + // AAAA("mapz", IPV6["spike-01.he"]), + + // A("@", IPV4["spike-02.he"]), + // AAAA("@", IPV6["spike-02.he"]), + // A("www", IPV4["spike-02.he"]), + // AAAA("www", IPV6["spike-02.he"]), + // A("api", IPV4["spike-02.he"]), + // AAAA("api", IPV6["spike-02.he"]), + // A("maps", IPV4["spike-02.he"]), + // AAAA("maps", IPV6["spike-02.he"]), + // A("mapz", IPV4["spike-02.he"]), + // AAAA("mapz", IPV6["spike-02.he"]), + + // A("@", IPV4["spike-03.he"]), + // AAAA("@", IPV6["spike-03.he"]), + // A("www", IPV4["spike-03.he"]), + // AAAA("www", IPV6["spike-03.he"]), + // A("api", IPV4["spike-03.he"]), + // AAAA("api", IPV6["spike-03.he"]), + // A("maps", IPV4["spike-03.he"]), + // AAAA("maps", IPV6["spike-03.he"]), + // A("mapz", IPV4["spike-03.he"]), + // AAAA("mapz", IPV6["spike-03.he"]), + + A("@", IPV4["spike-06"], CF_PROXY_ON), + AAAA("@", IPV6["spike-06"], CF_PROXY_ON), + A("www", IPV4["spike-06"], CF_PROXY_ON), + AAAA("www", IPV6["spike-06"], CF_PROXY_ON), + A("api", IPV4["spike-06"], CF_PROXY_ON), + AAAA("api", IPV6["spike-06"], CF_PROXY_ON), + A("maps", IPV4["spike-06"], CF_PROXY_ON), + AAAA("maps", IPV6["spike-06"], CF_PROXY_ON), + A("mapz", IPV4["spike-06"], CF_PROXY_ON), + AAAA("mapz", IPV6["spike-06"], CF_PROXY_ON), + + A("@", IPV4["spike-07"], CF_PROXY_ON), + AAAA("@", IPV6["spike-07"], CF_PROXY_ON), + A("www", IPV4["spike-07"], CF_PROXY_ON), + AAAA("www", IPV6["spike-07"], CF_PROXY_ON), + A("api", IPV4["spike-07"], CF_PROXY_ON), + AAAA("api", IPV6["spike-07"], CF_PROXY_ON), + A("maps", IPV4["spike-07"], CF_PROXY_ON), + AAAA("maps", IPV6["spike-07"], CF_PROXY_ON), + A("mapz", IPV4["spike-07"], CF_PROXY_ON), + AAAA("mapz", IPV6["spike-07"], CF_PROXY_ON), + + A("@", IPV4["spike-08"], CF_PROXY_ON), + AAAA("@", IPV6["spike-08"], CF_PROXY_ON), + A("www", IPV4["spike-08"], CF_PROXY_ON), + AAAA("www", IPV6["spike-08"], CF_PROXY_ON), + A("api", IPV4["spike-08"], CF_PROXY_ON), + AAAA("api", IPV6["spike-08"], CF_PROXY_ON), + A("maps", IPV4["spike-08"], CF_PROXY_ON), + AAAA("maps", IPV6["spike-08"], CF_PROXY_ON), + A("mapz", IPV4["spike-08"], CF_PROXY_ON), + AAAA("mapz", IPV6["spike-08"], CF_PROXY_ON), - A("stormfly-04", STORMFLY04_IPV4), - AAAA("stormfly-04", STORMFLY04_IPV6), - A("stormfly-04.oob", STORMFLY04_OOB), - - A("vhagar", VHAGAR_IPV4), - AAAA("vhagar", VHAGAR_IPV6), - A("vhagar.ams", VHAGAR_INTERNAL), - A("vhagar.oob", VHAGAR_OOB), + // Nominatim servers CNAME("nominatim", "nominatim.geo.openstreetmap.org."), CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."), @@ -300,281 +292,159 @@ 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("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("wawel", WAWEL_IPV4), - - A("scorch", SCORCH_IPV4), - AAAA("scorch", SCORCH_IPV6), - - A("rhaegal", RHAEGAL_IPV4), - AAAA("rhaegal", RHAEGAL_IPV6), - - A("palulukon", PALULUKON_IPV4), - - A("piasa", PIASA_IPV4), - AAAA("piasa", PIASA_IPV6), - A("piasa.oob", PIASA_OOB), - - A("bowser", BOWSER_IPV4), - - A("balerion", BALERION_IPV4), - - A("albi", ALBI_IPV4), - AAAA("albi", ALBI_IPV6), - 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), - A("render", NIDHOGG_IPV4), - AAAA("render", CULEBRE_IPV6), - 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), - CNAME("vector", "dualstack.n.sni.global.fastly.net."), - // Site gateways - - A("fafnir", FAFNIR_IPV4), - AAAA("fafnir", FAFNIR_IPV6), - A("fafnir.dub", FAFNIR_INTERNAL), - A("fafnir.oob", 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), - - // HTTPS / SVCB records HTTPS("planet", 1, ".", "alpn=h2"), - A("horntail", HORNTAIL_IPV4), - AAAA("horntail", HORNTAIL_IPV6), - // A("backup", HORNTAIL_IPV4), - // AAAA("backup", HORNTAIL_IPV6), - // A("planet", HORNTAIL_IPV4), - // AAAA("planet", HORNTAIL_IPV6), - A("horntail.dub", HORNTAIL_INTERNAL), - A("horntail.oob", HORNTAIL_OOB), - - // Database servers - - 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("backup", IPV4["norbert"]), + AAAA("backup", IPV6["norbert"]), + A("planet", IPV4["norbert"]), + AAAA("planet", IPV6["norbert"]), - A("snap-03.dub", SNAP03_INTERNAL), - A("snap-03.oob", SNAP03_OOB), - - A("karm.ams", KARM_INTERNAL), - A("karm.oob", KARM_OOB), - - A("eddie.ucl", EDDIE_INTERNAL), - A("eddie.oob", EDDIE_OOB), + // A("backup", IPV4["horntail.he"]), + // AAAA("backup", IPV6["horntail.he"]), + // A("planet", IPV4["horntail.he"]), + // AAAA("planet", IPV6["horntail.he"]), // 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("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"]), // Foundation server - A("ridley", RIDLEY_IPV4), - 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("blog", IPV4["ridley"]), + A("foundation", IPV4["ridley"]), - A("smaug", SMAUG_IPV4), - AAAA("smaug", SMAUG_IPV6), - A("matomo", SMAUG_IPV4), - AAAA("matomo", SMAUG_IPV6), - A("piwik", SMAUG_IPV4), - AAAA("piwik", SMAUG_IPV6), - A("smaug.dub", SMAUG_INTERNAL), - A("smaug.oob", SMAUG_OOB), + // Matomo server - // HTTPS / SVCB records HTTPS("matomo", 1, ".", "alpn=h2"), HTTPS("piwik", 1, ".", "alpn=h2"), + A("matomo", IPV4["smaug.he"]), + AAAA("matomo", IPV6["smaug.he"]), + A("piwik", IPV4["smaug.he"]), + AAAA("piwik", IPV6["smaug.he"]), + // 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("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), + HTTPS("agri", 1, ".", "alpn=h2"), + HTTPS("a.agri", 1, ".", "alpn=h2"), + HTTPS("b.agri", 1, ".", "alpn=h2"), + HTTPS("c.agri", 1, ".", "alpn=h2"), + + A("agri", IPV4["lockheed"]), + AAAA("agri", IPV6["lockheed"]), + A("a.agri", IPV4["lockheed"]), + AAAA("a.agri", IPV6["lockheed"]), + A("b.agri", IPV4["lockheed"]), + AAAA("b.agri", IPV6["lockheed"]), + A("c.agri", IPV4["lockheed"]), + AAAA("c.agri", IPV6["lockheed"]), + + HTTPS("os", 1, ".", "alpn=h2"), + HTTPS("a.os", 1, ".", "alpn=h2"), + HTTPS("b.os", 1, ".", "alpn=h2"), + HTTPS("c.os", 1, ".", "alpn=h2"), + + A("os", IPV4["lockheed"]), + AAAA("os", IPV6["lockheed"]), + A("a.os", IPV4["lockheed"]), + AAAA("a.os", IPV6["lockheed"]), + A("b.os", IPV4["lockheed"]), + AAAA("b.os", IPV6["lockheed"]), + A("c.os", IPV4["lockheed"]), + AAAA("c.os", IPV6["lockheed"]), + HTTPS("tiler", 1, ".", "alpn=h2"), + HTTPS("us-imagery", 1, ".", "alpn=h2"), + HTTPS("a.us-imagery", 1, ".", "alpn=h2"), + HTTPS("b.us-imagery", 1, ".", "alpn=h2"), + HTTPS("c.us-imagery", 1, ".", "alpn=h2"), - // Prometheus server and munin redirect + 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"]), - 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), + // Prometheus server and munin redirect - // HTTPS / SVCB records HTTPS("prometheus", 1, ".", "alpn=h2"), HTTPS("munin", 1, ".", "alpn=h2"), + A("prometheus", IPV4["stormfly-03"]), + AAAA("prometheus", IPV6["stormfly-03"]), + A("munin", IPV4["stormfly-03"]), + AAAA("munin", IPV6["stormfly-03"]), + // Management server - 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), - 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), - - // 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), - - // Managed network switches - - A("switch1.ams", SWITCH1AMS_IPV4), - AAAA("switch1.ams", SWITCH1AMS_IPV6), - - A("switch1.dub", SWITCH1DUB_IPV4), - AAAA("switch1.dub", SWITCH1DUB_IPV6), - - // Managed power strips - - 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.ams", OOB1AMS_INTERNAL), - - A("oob1.dub", OOB1DUB_INTERNAL), + 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"]), // 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), - - // HTTPS / SVCB records HTTPS("lists", 1, ".", "alpn=h2"), HTTPS("help", 1, ".", "alpn=h2"), - // 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("welcome", NAGA_IPV4), - AAAA("welcome", NAGA_IPV6), - A("operations", NAGA_IPV4), - AAAA("operations", NAGA_IPV6), - A("hot", NAGA_IPV4), - 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 + A("lists", IPV4["shenron"]), + AAAA("lists", IPV6["shenron"]), + A("help", IPV4["shenron"]), + AAAA("help", IPV6["shenron"]), + + // Naga services + HTTPS("svn", 1, ".", "alpn=h2"), HTTPS("trac", 1, ".", "alpn=h2"), HTTPS("irc", 1, ".", "alpn=h2"), @@ -586,57 +456,43 @@ 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("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"]), // Wiki servers - A("konqi", KONQI_IPV4), - AAAA("konqi", KONQI_IPV6), - A("wiki", KONQI_IPV4), - AAAA("wiki", KONQI_IPV6), - A("konqi.dub", KONQI_INTERNAL), - A("konqi.oob", KONQI_OOB), - - // HTTPS / SVCB records HTTPS("wiki", 1, ".", "alpn=h2"), - // Overpass server + A("wiki", IPV4["konqi.he"]), + AAAA("wiki", IPV6["konqi.he"]), - 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), + // Overpass server - // HTTPS / SVCB records HTTPS("query", 1, ".", "alpn=h2"), + A("query", IPV4["grisu.he"]), + AAAA("query", IPV6["grisu.he"]), + // GPS tile server - A("muirdris", MUIRDRIS_IPV4), - AAAA("muirdris", MUIRDRIS_IPV6), - A("gps-tile", MUIRDRIS_IPV4), - AAAA("gps-tile", MUIRDRIS_IPV6), - A("a.gps-tile", MUIRDRIS_IPV4), - AAAA("a.gps-tile", MUIRDRIS_IPV6), - A("b.gps-tile", MUIRDRIS_IPV4), - AAAA("b.gps-tile", MUIRDRIS_IPV6), - A("c.gps-tile", MUIRDRIS_IPV4), - AAAA("c.gps-tile", MUIRDRIS_IPV6), - A("gps.tile", MUIRDRIS_IPV4), - AAAA("gps.tile", MUIRDRIS_IPV6), - A("gps-a.tile", MUIRDRIS_IPV4), - AAAA("gps-a.tile", MUIRDRIS_IPV6), - A("gps-b.tile", MUIRDRIS_IPV4), - AAAA("gps-b.tile", MUIRDRIS_IPV6), - A("gps-c.tile", MUIRDRIS_IPV4), - AAAA("gps-c.tile", MUIRDRIS_IPV6), - 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"), @@ -645,111 +501,68 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), HTTPS("gps-b.tile", 1, ".", "alpn=h2"), HTTPS("gps-c.tile", 1, ".", "alpn=h2"), - // 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("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"]), // Donation site and new OSMF crm site - A("donate", RIDLEY_IPV4), - A("support", RIDLEY_IPV4), - A("supporting", RIDLEY_IPV4), - - // 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"), + A("donate", IPV4["ridley"]), + A("support", IPV4["ridley"]), + A("supporting", IPV4["ridley"]), // Discourse server ("community") - A("fume", FUME_IPV4), - AAAA("fume", FUME_IPV6), - A("fume.dub", FUME_INTERNAL), - A("fume.oob", FUME_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"), + 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"]), + 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"), + A("forum", IPV4["fume.he"]), + AAAA("forum", IPV6["fume.he"]), + // Taginfo and Staging Blog Server - A("tabaluga", TABALUGA_IPV4), - AAAA("tabaluga", TABALUGA_IPV6), - A("tabaluga.ams", TABALUGA_INTERNAL), - A("tabaluga.oob", TABALUGA_OOB), + HTTPS("taginfo", 1, ".", "alpn=h2"), - A("staging.blog", TABALUGA_IPV4), - AAAA("staging.blog", TABALUGA_IPV6), + A("taginfo", IPV4["tabaluga"]), + AAAA("taginfo", IPV6["tabaluga"]), - // 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), + A("staging.blog", IPV4["tabaluga"]), + AAAA("staging.blog", IPV6["tabaluga"]), // Uptime site at StatusCake - CNAME("uptime", "uptimessl-new.statuscake.com."), - - // Dynamic DNS records - - DYNAMIC_RECORDS + CNAME("uptime", "uptimessl-new.statuscake.com.") );