From 1bc5e18c9a386d142cdeb166769a5ff4cbf472d9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 19 Dec 2024 12:34:13 +0000 Subject: [PATCH 1/8] Add reverse DNS zones for Equinix addresses in Dublin --- dnsconfig.js | 12 +- src/hosts.js | 90 ++++++++----- src/ideditor.js | 4 +- src/openstreetmap-town.js | 6 +- src/openstreetmap.js | 272 +++++++++++++++++++------------------- src/osm-wiki.js | 26 ++-- src/osmfoundation.js | 6 +- src/ptr_he_dub_ipv4.js | 18 +++ src/ptr_he_dub_ipv6.js | 17 +++ src/stateofthemap.js | 56 ++++---- src/switch2osm.js | 8 +- 11 files changed, 294 insertions(+), 221 deletions(-) create mode 100644 src/ptr_he_dub_ipv4.js create mode 100644 src/ptr_he_dub_ipv6.js diff --git a/dnsconfig.js b/dnsconfig.js index 272ef15..fa2b960 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -144,6 +144,14 @@ IDEDITOR("ideditor.com", REG_GANDI); var OSMWIKI = loadTemplate("osm-wiki"); OSMWIKI("osm.wiki", REG_GANDI); +var PTR_HE_DUB_IPV4 = loadTemplate("ptr_he_dub_ipv4"); + +PTR_HE_DUB_IPV4("96-27.226.104.184.in-addr.arpa", REG_NONE); + +var PTR_HE_DUB_IPV6 = loadTemplate("ptr_he_dub_ipv6"); + +PTR_HE_DUB_IPV6(REV("2001:470:1:b3b::/64"), REG_NONE); + var PTR_EQUINIX_AMS_IPV4 = loadTemplate("ptr_equinix_ams_ipv4"); PTR_EQUINIX_AMS_IPV4("96-27.86.199.82.in-addr.arpa", REG_NONE); @@ -154,11 +162,11 @@ PTR_EQUINIX_AMS_IPV6(REV("2001:4d78:500:5e3::/64"), REG_NONE); var PTR_EQUINIX_DUB_IPV4 = loadTemplate("ptr_equinix_dub_ipv4"); -PTR_EQUINIX_DUB_IPV4("96-27.226.104.184.in-addr.arpa", REG_NONE); +PTR_EQUINIX_DUB_IPV4("96-27.214.252.87.in-addr.arpa", REG_NONE); var PTR_EQUINIX_DUB_IPV6 = loadTemplate("ptr_equinix_dub_ipv6"); -PTR_EQUINIX_DUB_IPV6(REV("2001:470:1:b3b::/64"), REG_NONE); +PTR_EQUINIX_DUB_IPV6(REV("2001:4d78:fe03:1c::/64"), REG_NONE); var PTR_EQUINIX_AMS_UPLINK_IPV4 = loadTemplate("ptr_equinix_ams_uplink_ipv4"); diff --git a/src/hosts.js b/src/hosts.js index 963f198..c40d63a 100644 --- a/src/hosts.js +++ b/src/hosts.js @@ -10,8 +10,10 @@ var BOWSER_IPV4 = "138.44.68.106"; var CMOK_IPV4 = "64.225.143.127"; -var CULEBRE_IPV4 = "184.104.226.105"; -var CULEBRE_IPV6 = "2001:470:1:b3b::9"; +var CULEBRE_IPV4 = "87.252.214.105"; +var CULEBRE_IPV6 = "2001:4d78:fe03:1c::9"; +var CULEBRE_IPV4_HE = "184.104.226.105"; +var CULEBRE_IPV6_HE = "2001:470:1:b3b::9"; var CULEBRE_INTERNAL = "10.0.64.9"; var CULEBRE_OOB = "10.0.65.9"; @@ -57,36 +59,48 @@ var FAFFY_IPV6 = "2001:4d78:500:5e3::3"; var FAFFY_INTERNAL = "10.0.48.3"; var FAFFY_OOB = "10.0.49.3"; -var FAFNIR_IPV4 = "184.104.226.98"; -var FAFNIR_IPV6 = "2001:470:1:b3b::2"; +var FAFNIR_IPV4 = "87.252.214.98"; +var FAFNIR_IPV6 = "2001:4d78:fe03:1c::2"; +var FAFNIR_IPV4_HE = "184.104.226.98"; +var FAFNIR_IPV6_HE = "2001:470:1:b3b::2"; var FAFNIR_INTERNAL = "10.0.64.2"; var FAFNIR_OOB = "10.0.65.2"; -var FUME_IPV4 = "184.104.226.112"; -var FUME_IPV6 = "2001:470:1:b3b::10"; +var FUME_IPV4 = "87.252.214.112"; +var FUME_IPV6 = "2001:4d78:fe03:1c::10"; +var FUME_IPV4_HE = "184.104.226.112"; +var FUME_IPV6_HE = "2001:470:1:b3b::10"; var FUME_INTERNAL = "10.0.64.16"; var FUME_OOB = "10.0.65.16"; -var GRISU_IPV4 = "184.104.226.113"; -var GRISU_IPV6 = "2001:470:1:b3b::11"; +var GRISU_IPV4 = "87.252.214.113"; +var GRISU_IPV6 = "2001:4d78:fe03:1c::11"; +var GRISU_IPV4_HE = "184.104.226.113"; +var GRISU_IPV6_HE = "2001:470:1:b3b::11"; var GRISU_INTERNAL = "10.0.64.17"; var GRISU_OOB = "10.0.65.17"; -var HORNTAIL_IPV4 = "184.104.226.106"; -var HORNTAIL_IPV6 = "2001:470:1:b3b::a"; +var HORNTAIL_IPV4 = "87.252.214.106"; +var HORNTAIL_IPV6 = "2001:4d78:fe03:1c::a"; +var HORNTAIL_IPV4_HE = "184.104.226.106"; +var HORNTAIL_IPV6_HE = "2001:470:1:b3b::a"; var HORNTAIL_INTERNAL = "10.0.64.10"; var HORNTAIL_OOB = "10.0.65.10"; -var IDRIS_IPV4 = "184.104.226.102"; -var IDRIS_IPV6 = "2001:470:1:b3b::6"; +var IDRIS_IPV4 = "87.252.214.102"; +var IDRIS_IPV6 = "2001:4d78:fe03:1c::6"; +var IDRIS_IPV4_HE = "184.104.226.102"; +var IDRIS_IPV6_HE = "2001:470:1:b3b::6"; var IDRIS_INTERNAL = "10.0.64.6"; var IDRIS_OOB = "10.0.65.6"; var KARM_INTERNAL = "10.0.48.50"; var KARM_OOB = "10.0.49.50"; -var KONQI_IPV4 = "184.104.226.103"; -var KONQI_IPV6 = "2001:470:1:b3b::7"; +var KONQI_IPV4 = "87.252.214.103"; +var KONQI_IPV6 = "2001:4d78:fe03:1c::7"; +var KONQI_IPV4_HE = "184.104.226.103"; +var KONQI_IPV6_HE = "2001:470:1:b3b::7"; var KONQI_INTERNAL = "10.0.64.7"; var KONQI_OOB = "10.0.65.7"; @@ -100,21 +114,27 @@ var LOCKHEED_IPV6 = "2001:4d78:500:5e3::10"; var LOCKHEED_INTERNAL = "10.0.48.16"; var LOCKHEED_OOB = "10.0.49.16"; -var LONGMA_IPV4 = "184.104.226.109"; -var LONGMA_IPV6 = "2001:470:1:b3b::d"; +var LONGMA_IPV4 = "87.252.214.109"; +var LONGMA_IPV6 = "2001:4d78:fe03:1c::d"; +var LONGMA_IPV4_HE = "184.104.226.109"; +var LONGMA_IPV6_HE = "2001:470:1:b3b::d"; var LONGMA_INTERNAL = "10.0.64.13"; var LONGMA_OOB = "10.0.65.13"; var MERAXES_IPV4 = "51.15.185.90"; var MERAXES_IPV6 = "2001:bc8:2d57:100:aa1e:84ff:fe72:e660"; -var MUIRDRIS_IPV4 = "184.104.226.111"; -var MUIRDRIS_IPV6 = "2001:470:1:b3b::f"; +var MUIRDRIS_IPV4 = "87.252.214.111"; +var MUIRDRIS_IPV6 = "2001:4d78:fe03:1c::f"; +var MUIRDRIS_IPV4_HE = "184.104.226.111"; +var MUIRDRIS_IPV6_HE = "2001:470:1:b3b::f"; var MUIRDRIS_INTERNAL = "10.0.64.15"; var MUIRDRIS_OOB = "10.0.65.15"; -var NAGA_IPV4 = "184.104.226.104"; -var NAGA_IPV6 = "2001:470:1:b3b::8"; +var NAGA_IPV4 = "87.252.214.104"; +var NAGA_IPV6 = "2001:4d78:fe03:1c::8"; +var NAGA_IPV4_HE = "184.104.226.104"; +var NAGA_IPV6_HE = "2001:470:1:b3b::8"; var NAGA_INTERNAL = "10.0.64.8"; var NAGA_OOB = "10.0.65.8"; @@ -168,8 +188,10 @@ var SCORCH_IPV6 = "2001:41d0:2:fc4f::1"; var SHENRON_IPV4 = "212.110.172.32"; var SHENRON_IPV6 = "2001:41c9:1:400::32"; -var SMAUG_IPV4 = "184.104.226.110"; -var SMAUG_IPV6 = "2001:470:1:b3b::e"; +var SMAUG_IPV4 = "87.252.214.110"; +var SMAUG_IPV6 = "2001:4d78:fe03:1c::e"; +var SMAUG_IPV4_HE = "184.104.226.110"; +var SMAUG_IPV6_HE = "2001:470:1:b3b::e"; var SMAUG_INTERNAL = "10.0.64.14"; var SMAUG_OOB = "10.0.65.14"; @@ -182,18 +204,24 @@ var SNAP02_OOB = "10.0.1.4"; var SNAP03_INTERNAL = "10.0.64.50"; var SNAP03_OOB = "10.0.65.50"; -var SPIKE01_IPV4 = "184.104.226.99"; -var SPIKE01_IPV6 = "2001:470:1:b3b::3"; +var SPIKE01_IPV4 = "87.252.214.99"; +var SPIKE01_IPV6 = "2001:4d78:fe03:1c::3"; +var SPIKE01_IPV4_HE = "184.104.226.99"; +var SPIKE01_IPV6_HE = "2001:470:1:b3b::3"; var SPIKE01_INTERNAL = "10.0.64.3"; var SPIKE01_OOB = "10.0.65.3"; -var SPIKE02_IPV4 = "184.104.226.100"; -var SPIKE02_IPV6 = "2001:470:1:b3b::4"; +var SPIKE02_IPV4 = "87.252.214.100"; +var SPIKE02_IPV6 = "2001:4d78:fe03:1c::4"; +var SPIKE02_IPV4_HE = "184.104.226.100"; +var SPIKE02_IPV6_HE = "2001:470:1:b3b::4"; var SPIKE02_INTERNAL = "10.0.64.4"; var SPIKE02_OOB = "10.0.65.4"; -var SPIKE03_IPV4 = "184.104.226.101"; -var SPIKE03_IPV6 = "2001:470:1:b3b::5"; +var SPIKE03_IPV4 = "87.252.214.101"; +var SPIKE03_IPV6 = "2001:4d78:fe03:1c::5"; +var SPIKE03_IPV4_HE = "184.104.226.101"; +var SPIKE03_IPV6_HE = "2001:470:1:b3b::5"; var SPIKE03_INTERNAL = "10.0.64.5"; var SPIKE03_OOB = "10.0.65.5"; @@ -223,8 +251,10 @@ var STORMFLY04_OOB = "10.0.0.3"; var SWITCH1AMS_IPV4 = "82.199.86.97"; var SWITCH1AMS_IPV6 = "2001:4d78:500:5e3::1"; -var SWITCH1DUB_IPV4 = "184.104.226.97"; -var SWITCH1DUB_IPV6 = "2001:470:1:b3b::1"; +var SWITCH1DUB_IPV4 = "87.252.214.97"; +var SWITCH1DUB_IPV6 = "2001:4d78:fe03:1c::1"; +var SWITCH1DUB_IPV4_HE = "184.104.226.97"; +var SWITCH1DUB_IPV6_HE = "2001:470:1:b3b::1"; var TABALUGA_IPV4 = "82.199.86.110"; var TABALUGA_IPV6 = "2001:4d78:500:5e3::e"; diff --git a/src/ideditor.js b/src/ideditor.js index 8706619..3faa1e2 100644 --- a/src/ideditor.js +++ b/src/ideditor.js @@ -28,7 +28,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ALIAS("@", "openstreetmap.github.io."), CNAME("www", "openstreetmap.github.io."), - A("preview", NAGA_IPV4), - AAAA("preview", NAGA_IPV6) + A("preview", NAGA_IPV4_HE), + AAAA("preview", NAGA_IPV6_HE) ); diff --git a/src/openstreetmap-town.js b/src/openstreetmap-town.js index 0d56540..ab3d792 100644 --- a/src/openstreetmap-town.js +++ b/src/openstreetmap-town.js @@ -34,7 +34,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Redirect en.openstreetmap.town to en.osm.town - A("en", NAGA_IPV4), - AAAA("en", NAGA_IPV6) + A("en", NAGA_IPV4_HE), + AAAA("en", NAGA_IPV6_HE) -); \ No newline at end of file +); diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 1bf2cfb..0d44605 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", 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), // Publish SPF records indicating that only shenron sends mail @@ -213,48 +213,48 @@ 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", 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), - 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", 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), - 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", 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), @@ -316,8 +316,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("dulcy.ams", DULCY_INTERNAL), A("dulcy.oob", DULCY_OOB), - A("longma", LONGMA_IPV4), - AAAA("longma", LONGMA_IPV6), + A("longma", LONGMA_IPV4_HE), + AAAA("longma", LONGMA_IPV6_HE), A("longma.dub", LONGMA_INTERNAL), A("longma.oob", LONGMA_OOB), @@ -345,8 +345,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("ysera.ucl", YSERA_INTERNAL), A("ysera.oob", YSERA_OOB), - A("culebre", CULEBRE_IPV4), - AAAA("culebre", CULEBRE_IPV6), + A("culebre", CULEBRE_IPV4_HE), + AAAA("culebre", CULEBRE_IPV6_HE), A("culebre.dub", CULEBRE_INTERNAL), A("culebre.oob", CULEBRE_OOB), @@ -380,9 +380,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("b.tile", "dualstack.n.sni.global.fastly.net."), CNAME("c.tile", "dualstack.n.sni.global.fastly.net."), - A("render", CULEBRE_IPV4), + A("render", CULEBRE_IPV4_HE), A("render", NIDHOGG_IPV4), - AAAA("render", CULEBRE_IPV6), + AAAA("render", CULEBRE_IPV6_HE), AAAA("render", NIDHOGG_IPV6), // Vector tile servers @@ -393,8 +393,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Site gateways - A("fafnir", FAFNIR_IPV4), - AAAA("fafnir", FAFNIR_IPV6), + A("fafnir", FAFNIR_IPV4_HE), + AAAA("fafnir", FAFNIR_IPV6_HE), A("fafnir.dub", FAFNIR_INTERNAL), A("fafnir.oob", FAFNIR_OOB), @@ -412,12 +412,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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", 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), @@ -473,12 +473,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Matomo server - 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", 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), @@ -522,20 +522,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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", 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), @@ -555,8 +555,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("switch1.ams", SWITCH1AMS_IPV4), AAAA("switch1.ams", SWITCH1AMS_IPV6), - A("switch1.dub", SWITCH1DUB_IPV4), - AAAA("switch1.dub", SWITCH1DUB_IPV6), + A("switch1.dub", SWITCH1DUB_IPV4_HE), + AAAA("switch1.dub", SWITCH1DUB_IPV6_HE), // Managed power strips @@ -607,28 +607,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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), + 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), // HTTPS / SVCB records HTTPS("svn", 1, ".", "alpn=h2"), @@ -647,10 +647,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Wiki servers - A("konqi", KONQI_IPV4), - AAAA("konqi", KONQI_IPV6), - A("wiki", KONQI_IPV4), - AAAA("wiki", KONQI_IPV6), + 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), @@ -659,10 +659,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Overpass server - A("grisu", GRISU_IPV4), - AAAA("grisu", GRISU_IPV6), - A("query", GRISU_IPV4), - AAAA("query", GRISU_IPV6), + 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), @@ -671,24 +671,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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", 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), @@ -748,17 +748,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Discourse server ("community") - A("fume", FUME_IPV4), - AAAA("fume", FUME_IPV6), + A("fume", FUME_IPV4_HE), + AAAA("fume", FUME_IPV6_HE), 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), + 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), // HTTPS / SVCB records HTTPS("community", 1, ".", "alpn=h2"), @@ -768,8 +768,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"), - A("forum", FUME_IPV4), - AAAA("forum", FUME_IPV6), + A("forum", FUME_IPV4_HE), + AAAA("forum", FUME_IPV6_HE), // HTTPS / SVCB records HTTPS("forum", 1, ".", "alpn=h2"), diff --git a/src/osm-wiki.js b/src/osm-wiki.js index 80b1080..3fb4add 100644 --- a/src/osm-wiki.js +++ b/src/osm-wiki.js @@ -20,12 +20,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), MX("@", 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", 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), // Delegate SPF policy to the main domain @@ -58,11 +58,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"), TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"), - A("wiki", KONQI_IPV4), - AAAA("wiki", KONQI_IPV6), - A("www", KONQI_IPV4), - AAAA("www", KONQI_IPV6), - A("@", KONQI_IPV4), - AAAA("@", KONQI_IPV6) + A("wiki", KONQI_IPV4_HE), + AAAA("wiki", KONQI_IPV6_HE), + A("www", KONQI_IPV4_HE), + AAAA("www", KONQI_IPV6_HE), + A("@", KONQI_IPV4_HE), + AAAA("@", KONQI_IPV6_HE) -); \ No newline at end of file +); diff --git a/src/osmfoundation.js b/src/osmfoundation.js index d64efe0..78cb4ff 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -116,8 +116,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("board", RIDLEY_IPV4), A("dwg", RIDLEY_IPV4), A("mwg", RIDLEY_IPV4), - A("operations", NAGA_IPV4), - AAAA("operations", NAGA_IPV6), + A("operations", NAGA_IPV4_HE), + AAAA("operations", NAGA_IPV6_HE), // HTTPS / SVCB records HTTPS("www", 1, ".", "alpn=h2"), @@ -143,7 +143,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // HTTPS / SVCB records HTTPS("staging.blog", 1, ".", "alpn=h2"), - A("hardware", IDRIS_IPV4), + A("hardware", IDRIS_IPV4_HE), // HTTPS / SVCB records HTTPS("hardware", 1, ".", "alpn=h2") diff --git a/src/ptr_he_dub_ipv4.js b/src/ptr_he_dub_ipv4.js new file mode 100644 index 0000000..2295810 --- /dev/null +++ b/src/ptr_he_dub_ipv4.js @@ -0,0 +1,18 @@ +// http://www.he.net/adm/reverse.dns.html (RFC4183 notation) +D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), + PTR(CULEBRE_IPV4_HE.split(".").pop(), "culebre.openstreetmap.org."), + PTR(FAFNIR_IPV4_HE.split(".").pop(), "fafnir.openstreetmap.org."), + PTR(FUME_IPV4_HE.split(".").pop(), "fume.openstreetmap.org."), + PTR(GRISU_IPV4_HE.split(".").pop(), "grisu.openstreetmap.org."), + PTR(HORNTAIL_IPV4_HE.split(".").pop(), "horntail.openstreetmap.org."), + PTR(IDRIS_IPV4_HE.split(".").pop(), "idris.openstreetmap.org."), + PTR(KONQI_IPV4_HE.split(".").pop(), "konqi.openstreetmap.org."), + PTR(LONGMA_IPV4_HE.split(".").pop(), "longma.openstreetmap.org."), + PTR(MUIRDRIS_IPV4_HE.split(".").pop(), "muirdris.openstreetmap.org."), + PTR(NAGA_IPV4_HE.split(".").pop(), "naga.openstreetmap.org."), + PTR(SMAUG_IPV4_HE.split(".").pop(), "smaug.openstreetmap.org."), + PTR(SPIKE01_IPV4_HE.split(".").pop(), "spike-01.openstreetmap.org."), + PTR(SPIKE02_IPV4_HE.split(".").pop(), "spike-02.openstreetmap.org."), + PTR(SPIKE03_IPV4_HE.split(".").pop(), "spike-03.openstreetmap.org."), + PTR(SWITCH1DUB_IPV4_HE.split(".").pop(), "switch1.dub.openstreetmap.org.") +); diff --git a/src/ptr_he_dub_ipv6.js b/src/ptr_he_dub_ipv6.js new file mode 100644 index 0000000..8e94546 --- /dev/null +++ b/src/ptr_he_dub_ipv6.js @@ -0,0 +1,17 @@ +D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), + PTR(CULEBRE_IPV6_HE, "culebre.openstreetmap.org."), + PTR(FAFNIR_IPV6_HE, "fafnir.openstreetmap.org."), + PTR(FUME_IPV6_HE, "fume.openstreetmap.org."), + PTR(GRISU_IPV6_HE, "grisu.openstreetmap.org."), + PTR(HORNTAIL_IPV6_HE, "horntail.openstreetmap.org."), + PTR(IDRIS_IPV6_HE, "idris.openstreetmap.org."), + PTR(KONQI_IPV6_HE, "konqi.openstreetmap.org."), + PTR(LONGMA_IPV6_HE, "longma.openstreetmap.org."), + PTR(MUIRDRIS_IPV6_HE.split(".").pop(), "muirdris.openstreetmap.org."), + PTR(NAGA_IPV6_HE, "naga.openstreetmap.org."), + PTR(SMAUG_IPV6_HE.split(".").pop(), "smaug.openstreetmap.org."), + PTR(SPIKE01_IPV6_HE, "spike-01.openstreetmap.org."), + PTR(SPIKE02_IPV6_HE, "spike-02.openstreetmap.org."), + PTR(SPIKE03_IPV6_HE, "spike-03.openstreetmap.org."), + PTR(SWITCH1DUB_IPV6_HE, "switch1.dub.openstreetmap.org.") +); diff --git a/src/stateofthemap.js b/src/stateofthemap.js index a224ea4..ec03526 100644 --- a/src/stateofthemap.js +++ b/src/stateofthemap.js @@ -46,37 +46,37 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", NAGA_IPV4), - AAAA("@", NAGA_IPV6), - A("www", NAGA_IPV4), - AAAA("www", NAGA_IPV6), - A("2024", NAGA_IPV4), - AAAA("2024", NAGA_IPV6), - A("2022", NAGA_IPV4), - AAAA("2022", NAGA_IPV6), - A("2021", NAGA_IPV4), - AAAA("2021", NAGA_IPV6), - A("2020", NAGA_IPV4), - AAAA("2020", NAGA_IPV6), - A("2019", NAGA_IPV4), - AAAA("2019", NAGA_IPV6), - A("2018", NAGA_IPV4), - AAAA("2018", NAGA_IPV6), - A("2017", NAGA_IPV4), - AAAA("2017", NAGA_IPV6), - A("2016", NAGA_IPV4), - AAAA("2016", NAGA_IPV6), - A("2013", NAGA_IPV4), - AAAA("2013", NAGA_IPV6), + A("@", NAGA_IPV4_HE), + AAAA("@", NAGA_IPV6_HE), + A("www", NAGA_IPV4_HE), + AAAA("www", NAGA_IPV6_HE), + A("2024", NAGA_IPV4_HE), + AAAA("2024", NAGA_IPV6_HE), + A("2022", NAGA_IPV4_HE), + AAAA("2022", NAGA_IPV6_HE), + A("2021", NAGA_IPV4_HE), + AAAA("2021", NAGA_IPV6_HE), + A("2020", NAGA_IPV4_HE), + AAAA("2020", NAGA_IPV6_HE), + A("2019", NAGA_IPV4_HE), + AAAA("2019", NAGA_IPV6_HE), + A("2018", NAGA_IPV4_HE), + AAAA("2018", NAGA_IPV6_HE), + A("2017", NAGA_IPV4_HE), + AAAA("2017", NAGA_IPV6_HE), + A("2016", NAGA_IPV4_HE), + AAAA("2016", NAGA_IPV6_HE), + A("2013", NAGA_IPV4_HE), + AAAA("2013", NAGA_IPV6_HE), A("2012", RIDLEY_IPV4), A("2011", RIDLEY_IPV4), A("2010", RIDLEY_IPV4), - A("2009", NAGA_IPV4), - AAAA("2009", NAGA_IPV6), - A("2008", NAGA_IPV4), - AAAA("2008", NAGA_IPV6), - A("2007", NAGA_IPV4), - AAAA("2007", NAGA_IPV6), + A("2009", NAGA_IPV4_HE), + AAAA("2009", NAGA_IPV6_HE), + A("2008", NAGA_IPV4_HE), + AAAA("2008", NAGA_IPV6_HE), + A("2007", NAGA_IPV4_HE), + AAAA("2007", NAGA_IPV6_HE), // HTTPS / SVCB records HTTPS("@", 1, ".", "alpn=h2"), diff --git a/src/switch2osm.js b/src/switch2osm.js index 26097f2..339a4f1 100644 --- a/src/switch2osm.js +++ b/src/switch2osm.js @@ -26,10 +26,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", NAGA_IPV4), - AAAA("@", NAGA_IPV6), - A("www", NAGA_IPV4), - AAAA("www", NAGA_IPV6), + A("@", NAGA_IPV4_HE), + AAAA("@", NAGA_IPV6_HE), + A("www", NAGA_IPV4_HE), + AAAA("www", NAGA_IPV6_HE), // HTTPS / SVCB records HTTPS("@", 1, ".", "alpn=h2"), -- 2.39.5 From ebd3f1ce11537cc80bed12674c3a3af961590421 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 7 Jan 2025 17:05:51 +0000 Subject: [PATCH 2/8] Remove Equinix uplink reverse DNS --- dnsconfig.js | 16 ---------------- src/ptr_equinix_ams_uplink_ipv4.js | 6 ------ src/ptr_equinix_ams_uplink_ipv6.js | 6 ------ src/ptr_equinix_dub_uplink_ipv4.js | 6 ------ src/ptr_equinix_dub_uplink_ipv6.js | 6 ------ 5 files changed, 40 deletions(-) delete mode 100644 src/ptr_equinix_ams_uplink_ipv4.js delete mode 100644 src/ptr_equinix_ams_uplink_ipv6.js delete mode 100644 src/ptr_equinix_dub_uplink_ipv4.js delete mode 100644 src/ptr_equinix_dub_uplink_ipv6.js diff --git a/dnsconfig.js b/dnsconfig.js index fa2b960..639192e 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -168,22 +168,6 @@ var PTR_EQUINIX_DUB_IPV6 = loadTemplate("ptr_equinix_dub_ipv6"); PTR_EQUINIX_DUB_IPV6(REV("2001:4d78:fe03:1c::/64"), REG_NONE); -var PTR_EQUINIX_AMS_UPLINK_IPV4 = loadTemplate("ptr_equinix_ams_uplink_ipv4"); - -PTR_EQUINIX_AMS_UPLINK_IPV4("72-29.86.199.82.in-addr.arpa", REG_NONE); - -var PTR_EQUINIX_AMS_UPLINK_IPV6 = loadTemplate("ptr_equinix_ams_uplink_ipv6"); - -PTR_EQUINIX_AMS_UPLINK_IPV6(REV("2001:4d78:500:5e2::/64"), REG_NONE); - -var PTR_EQUINIX_DUB_UPLINK_IPV4 = loadTemplate("ptr_equinix_dub_uplink_ipv4"); - -PTR_EQUINIX_DUB_UPLINK_IPV4("104-29.218.252.87.in-addr.arpa", REG_NONE); - -var PTR_EQUINIX_DUB_UPLINK_IPV6 = loadTemplate("ptr_equinix_dub_uplink_ipv6"); - -PTR_EQUINIX_DUB_UPLINK_IPV6(REV("2001:4d78:fe03:1b::/64"), REG_NONE); - // No immediate plans // External DNS and hosting still up // freethepostcode.org diff --git a/src/ptr_equinix_ams_uplink_ipv4.js b/src/ptr_equinix_ams_uplink_ipv4.js deleted file mode 100644 index 8842f32..0000000 --- a/src/ptr_equinix_ams_uplink_ipv4.js +++ /dev/null @@ -1,6 +0,0 @@ -D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(EQUINIXGWAMS_IPV4.split(".").pop(), "equinix-gw.ams.openstreetmap.org."), - PTR(EQUINIXGW1AMS_IPV4.split(".").pop(), "equinix-gw-1.ams.openstreetmap.org."), - PTR(EQUINIXGW2AMS_IPV4.split(".").pop(), "equinix-gw-2.ams.openstreetmap.org."), - PTR(EQUINIXOSMAMS_IPV4.split(".").pop(), "equinix-osm.ams.openstreetmap.org.") -); diff --git a/src/ptr_equinix_ams_uplink_ipv6.js b/src/ptr_equinix_ams_uplink_ipv6.js deleted file mode 100644 index bab12cb..0000000 --- a/src/ptr_equinix_ams_uplink_ipv6.js +++ /dev/null @@ -1,6 +0,0 @@ -D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(EQUINIXGWAMS_IPV6, "equinix-gw.ams.openstreetmap.org."), - PTR(EQUINIXGW1AMS_IPV6, "equinix-gw-1.ams.openstreetmap.org."), - PTR(EQUINIXGW2AMS_IPV6, "equinix-gw-2.ams.openstreetmap.org."), - PTR(EQUINIXOSMAMS_IPV6, "equinix-osm.ams.openstreetmap.org.") -); diff --git a/src/ptr_equinix_dub_uplink_ipv4.js b/src/ptr_equinix_dub_uplink_ipv4.js deleted file mode 100644 index 9e5b8e9..0000000 --- a/src/ptr_equinix_dub_uplink_ipv4.js +++ /dev/null @@ -1,6 +0,0 @@ -D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(EQUINIXGWDUB_IPV4.split(".").pop(), "equinix-gw.dub.openstreetmap.org."), - PTR(EQUINIXGW1DUB_IPV4.split(".").pop(), "equinix-gw-1.dub.openstreetmap.org."), - PTR(EQUINIXGW2DUB_IPV4.split(".").pop(), "equinix-gw-2.dub.openstreetmap.org."), - PTR(EQUINIXOSMDUB_IPV4.split(".").pop(), "equinix-osm.dub.openstreetmap.org.") -); diff --git a/src/ptr_equinix_dub_uplink_ipv6.js b/src/ptr_equinix_dub_uplink_ipv6.js deleted file mode 100644 index 36dcc89..0000000 --- a/src/ptr_equinix_dub_uplink_ipv6.js +++ /dev/null @@ -1,6 +0,0 @@ -D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(EQUINIXGWDUB_IPV6, "equinix-gw.dub.openstreetmap.org."), - PTR(EQUINIXGW1DUB_IPV6, "equinix-gw-1.dub.openstreetmap.org."), - PTR(EQUINIXGW2DUB_IPV6, "equinix-gw-2.dub.openstreetmap.org."), - PTR(EQUINIXOSMDUB_IPV6, "equinix-osm.dub.openstreetmap.org.") -); -- 2.39.5 From bf8c5e2e26f69bf4f2550595b2952c468dd1e2a7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 9 Jan 2025 10:52:59 +0000 Subject: [PATCH 3/8] Drop scorch from DNS --- src/hosts.js | 3 --- src/openstreetmap.js | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/hosts.js b/src/hosts.js index c40d63a..0a63e6a 100644 --- a/src/hosts.js +++ b/src/hosts.js @@ -182,9 +182,6 @@ var RIDLEY_IPV4 = "193.60.236.19"; var RIDLEY_INTERNAL = "10.0.0.3"; var RIDLEY_OOB = "10.0.1.3"; -var SCORCH_IPV4 = "176.31.235.79"; -var SCORCH_IPV6 = "2001:41d0:2:fc4f::1"; - var SHENRON_IPV4 = "212.110.172.32"; var SHENRON_IPV6 = "2001:41c9:1:400::32"; diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 0d44605..9b4e67a 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -356,9 +356,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("wawel", WAWEL_IPV4), - A("scorch", SCORCH_IPV4), - AAAA("scorch", SCORCH_IPV6), - A("rhaegal", RHAEGAL_IPV4), AAAA("rhaegal", RHAEGAL_IPV6), -- 2.39.5 From 37d556a66cd4f7ca4d699b4011765d2a9cbd7926 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 11 Jan 2025 21:14:44 +0000 Subject: [PATCH 4/8] Remove bowser & balerion --- src/hosts.js | 4 ---- src/openstreetmap.js | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/hosts.js b/src/hosts.js index 0a63e6a..f886a9a 100644 --- a/src/hosts.js +++ b/src/hosts.js @@ -4,10 +4,6 @@ var ALBI_IPV6 = "2001:0bc8:1200:0004:dac4:97ff:fe8a:9cfc"; var ANGOR_IPV4 = "196.10.54.165"; var ANGOR_IPV6 = "2001:43f8:1f4:b00:b283:feff:fed8:dd45"; -var BALERION_IPV4 = "138.44.68.134"; - -var BOWSER_IPV4 = "138.44.68.106"; - var CMOK_IPV4 = "64.225.143.127"; var CULEBRE_IPV4 = "87.252.214.105"; diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 9b4e67a..11a9a29 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -365,10 +365,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), -- 2.39.5 From 24b9f96d9c33184d700ec775c38a9970fb7a570f Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 13 Jan 2025 21:38:07 +0000 Subject: [PATCH 5/8] Add openstreetmap.org.nz --- dnsconfig.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dnsconfig.js b/dnsconfig.js index 639192e..ed26dfd 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -76,6 +76,7 @@ OPENSTREETMAP("openstreetmap.sg", REG_GANDI); OPENSTREETMAP("openstreetmap.tv", REG_GANDI); OPENSTREETMAP("openstreetmap.wales", REG_GANDI); OPENSTREETMAP("openstreetmapdata.org", REG_GANDI); +OPENSTREETMAP("openstreetmap.org.nz", REG_GANDI); // Disable due to registration issue // OPENSTREETMAP("openstreetmap.al", REG_NONE); -- 2.39.5 From d6450f20354e504b162de5250043efec7df4270d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 14 Jan 2025 12:46:17 +0000 Subject: [PATCH 6/8] Use REV for rfc4183 PTR records --- dnsconfig.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index ed26dfd..77f9c0c 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -24,6 +24,9 @@ function loadTemplate(template) { }; } +// Ensure that the reverse DNS records are in RFC 4183 notation +REVCOMPAT("rfc4183"); + require("src/hosts.js"); var OPENSTREETMAP = loadTemplate("openstreetmap"); @@ -147,7 +150,7 @@ OSMWIKI("osm.wiki", REG_GANDI); var PTR_HE_DUB_IPV4 = loadTemplate("ptr_he_dub_ipv4"); -PTR_HE_DUB_IPV4("96-27.226.104.184.in-addr.arpa", REG_NONE); +PTR_HE_DUB_IPV4(REV("184.104.226.96/27"), REG_NONE); var PTR_HE_DUB_IPV6 = loadTemplate("ptr_he_dub_ipv6"); @@ -155,7 +158,7 @@ PTR_HE_DUB_IPV6(REV("2001:470:1:b3b::/64"), REG_NONE); var PTR_EQUINIX_AMS_IPV4 = loadTemplate("ptr_equinix_ams_ipv4"); -PTR_EQUINIX_AMS_IPV4("96-27.86.199.82.in-addr.arpa", REG_NONE); +PTR_EQUINIX_AMS_IPV4(REV("82.199.86.96/27"), REG_NONE); var PTR_EQUINIX_AMS_IPV6 = loadTemplate("ptr_equinix_ams_ipv6"); @@ -163,7 +166,7 @@ PTR_EQUINIX_AMS_IPV6(REV("2001:4d78:500:5e3::/64"), REG_NONE); var PTR_EQUINIX_DUB_IPV4 = loadTemplate("ptr_equinix_dub_ipv4"); -PTR_EQUINIX_DUB_IPV4("96-27.214.252.87.in-addr.arpa", REG_NONE); +PTR_EQUINIX_DUB_IPV4(REV("87.252.214.96/27"), REG_NONE); var PTR_EQUINIX_DUB_IPV6 = loadTemplate("ptr_equinix_dub_ipv6"); -- 2.39.5 From b086c461f0ae69cc88e33b5b8ec2d57485e1ea27 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 14 Jan 2025 13:48:14 +0000 Subject: [PATCH 7/8] Remove old KVM, move dribble to vector --- src/openstreetmap.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 11a9a29..d2beb44 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -382,6 +382,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("cmok", CMOK_IPV4), + A("dribble", DRIBBLE_IPV4), + AAAA("dribble", DRIBBLE_IPV6), + A("dribble.ams", DRIBBLE_INTERNAL), + A("dribble.oob", DRIBBLE_OOB), + CNAME("vector", "dualstack.n.sni.global.fastly.net."), // Site gateways @@ -539,10 +544,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), HTTPS("git", 1, ".", "alpn=h2"), HTTPS("hardware", 1, ".", "alpn=h2"), - // KVMs - - A("kvm1.ucl", KVM1_INTERNAL), - // Managed network switches A("switch1.ams", SWITCH1AMS_IPV4), @@ -788,10 +789,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Spare servers - A("dribble", DRIBBLE_IPV4), - AAAA("dribble", DRIBBLE_IPV6), - A("dribble.ams", DRIBBLE_INTERNAL), - A("dribble.oob", DRIBBLE_OOB), // Uptime site at StatusCake -- 2.39.5 From 7478f25a912e2fc62cc88ff2702f75c059aeb492 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 17 Jan 2025 22:59:10 +0000 Subject: [PATCH 8/8] Use new cleaner PTR rfc4183 support --- src/ptr_equinix_ams_ipv4.js | 24 ++++++++++++------------ src/ptr_equinix_dub_ipv4.js | 30 +++++++++++++++--------------- src/ptr_he_dub_ipv4.js | 30 +++++++++++++++--------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/ptr_equinix_ams_ipv4.js b/src/ptr_equinix_ams_ipv4.js index e299684..88b7b65 100644 --- a/src/ptr_equinix_ams_ipv4.js +++ b/src/ptr_equinix_ams_ipv4.js @@ -1,15 +1,15 @@ // http://www.he.net/adm/reverse.dns.html (RFC4183 notation) D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(DRIBBLE_IPV4.split(".").pop(), "dribble.openstreetmap.org."), - PTR(DULCY_IPV4.split(".").pop(), "dulcy.openstreetmap.org."), - PTR(FAFFY_IPV4.split(".").pop(), "faffy.openstreetmap.org."), - PTR(LOCKHEED_IPV4.split(".").pop(), "lockheed.openstreetmap.org."), - PTR(NORBERT_IPV4.split(".").pop(), "norbert.openstreetmap.org."), - PTR(ODIN_IPV4.split(".").pop(), "odin.openstreetmap.org."), - PTR(SPIKE06_IPV4.split(".").pop(), "spike-06.openstreetmap.org."), - PTR(SPIKE07_IPV4.split(".").pop(), "spike-07.openstreetmap.org."), - PTR(SPIKE08_IPV4.split(".").pop(), "spike-08.openstreetmap.org."), - PTR(TABALUGA_IPV4.split(".").pop(), "tabaluga.openstreetmap.org."), - PTR(VHAGAR_IPV4.split(".").pop(), "vhagar.openstreetmap.org."), - PTR(SWITCH1AMS_IPV4.split(".").pop(), "switch1.ams.openstreetmap.org.") + PTR(DRIBBLE_IPV4, "dribble.openstreetmap.org."), + PTR(DULCY_IPV4, "dulcy.openstreetmap.org."), + PTR(FAFFY_IPV4, "faffy.openstreetmap.org."), + PTR(LOCKHEED_IPV4, "lockheed.openstreetmap.org."), + PTR(NORBERT_IPV4, "norbert.openstreetmap.org."), + PTR(ODIN_IPV4, "odin.openstreetmap.org."), + PTR(SPIKE06_IPV4, "spike-06.openstreetmap.org."), + PTR(SPIKE07_IPV4, "spike-07.openstreetmap.org."), + PTR(SPIKE08_IPV4, "spike-08.openstreetmap.org."), + PTR(TABALUGA_IPV4, "tabaluga.openstreetmap.org."), + PTR(VHAGAR_IPV4, "vhagar.openstreetmap.org."), + PTR(SWITCH1AMS_IPV4, "switch1.ams.openstreetmap.org.") ); diff --git a/src/ptr_equinix_dub_ipv4.js b/src/ptr_equinix_dub_ipv4.js index 401c4b0..ff073e9 100644 --- a/src/ptr_equinix_dub_ipv4.js +++ b/src/ptr_equinix_dub_ipv4.js @@ -1,18 +1,18 @@ // http://www.he.net/adm/reverse.dns.html (RFC4183 notation) D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(CULEBRE_IPV4.split(".").pop(), "culebre.openstreetmap.org."), - PTR(FAFNIR_IPV4.split(".").pop(), "fafnir.openstreetmap.org."), - PTR(FUME_IPV4.split(".").pop(), "fume.openstreetmap.org."), - PTR(GRISU_IPV4.split(".").pop(), "grisu.openstreetmap.org."), - PTR(HORNTAIL_IPV4.split(".").pop(), "horntail.openstreetmap.org."), - PTR(IDRIS_IPV4.split(".").pop(), "idris.openstreetmap.org."), - PTR(KONQI_IPV4.split(".").pop(), "konqi.openstreetmap.org."), - PTR(LONGMA_IPV4.split(".").pop(), "longma.openstreetmap.org."), - PTR(MUIRDRIS_IPV4.split(".").pop(), "muirdris.openstreetmap.org."), - PTR(NAGA_IPV4.split(".").pop(), "naga.openstreetmap.org."), - PTR(SMAUG_IPV4.split(".").pop(), "smaug.openstreetmap.org."), - PTR(SPIKE01_IPV4.split(".").pop(), "spike-01.openstreetmap.org."), - PTR(SPIKE02_IPV4.split(".").pop(), "spike-02.openstreetmap.org."), - PTR(SPIKE03_IPV4.split(".").pop(), "spike-03.openstreetmap.org."), - PTR(SWITCH1DUB_IPV4.split(".").pop(), "switch1.dub.openstreetmap.org.") + PTR(CULEBRE_IPV4, "culebre.openstreetmap.org."), + PTR(FAFNIR_IPV4, "fafnir.openstreetmap.org."), + PTR(FUME_IPV4, "fume.openstreetmap.org."), + PTR(GRISU_IPV4, "grisu.openstreetmap.org."), + PTR(HORNTAIL_IPV4, "horntail.openstreetmap.org."), + PTR(IDRIS_IPV4, "idris.openstreetmap.org."), + PTR(KONQI_IPV4, "konqi.openstreetmap.org."), + PTR(LONGMA_IPV4, "longma.openstreetmap.org."), + PTR(MUIRDRIS_IPV4, "muirdris.openstreetmap.org."), + PTR(NAGA_IPV4, "naga.openstreetmap.org."), + PTR(SMAUG_IPV4, "smaug.openstreetmap.org."), + PTR(SPIKE01_IPV4, "spike-01.openstreetmap.org."), + PTR(SPIKE02_IPV4, "spike-02.openstreetmap.org."), + PTR(SPIKE03_IPV4, "spike-03.openstreetmap.org."), + PTR(SWITCH1DUB_IPV4, "switch1.dub.openstreetmap.org.") ); diff --git a/src/ptr_he_dub_ipv4.js b/src/ptr_he_dub_ipv4.js index 2295810..407a989 100644 --- a/src/ptr_he_dub_ipv4.js +++ b/src/ptr_he_dub_ipv4.js @@ -1,18 +1,18 @@ // http://www.he.net/adm/reverse.dns.html (RFC4183 notation) D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(CULEBRE_IPV4_HE.split(".").pop(), "culebre.openstreetmap.org."), - PTR(FAFNIR_IPV4_HE.split(".").pop(), "fafnir.openstreetmap.org."), - PTR(FUME_IPV4_HE.split(".").pop(), "fume.openstreetmap.org."), - PTR(GRISU_IPV4_HE.split(".").pop(), "grisu.openstreetmap.org."), - PTR(HORNTAIL_IPV4_HE.split(".").pop(), "horntail.openstreetmap.org."), - PTR(IDRIS_IPV4_HE.split(".").pop(), "idris.openstreetmap.org."), - PTR(KONQI_IPV4_HE.split(".").pop(), "konqi.openstreetmap.org."), - PTR(LONGMA_IPV4_HE.split(".").pop(), "longma.openstreetmap.org."), - PTR(MUIRDRIS_IPV4_HE.split(".").pop(), "muirdris.openstreetmap.org."), - PTR(NAGA_IPV4_HE.split(".").pop(), "naga.openstreetmap.org."), - PTR(SMAUG_IPV4_HE.split(".").pop(), "smaug.openstreetmap.org."), - PTR(SPIKE01_IPV4_HE.split(".").pop(), "spike-01.openstreetmap.org."), - PTR(SPIKE02_IPV4_HE.split(".").pop(), "spike-02.openstreetmap.org."), - PTR(SPIKE03_IPV4_HE.split(".").pop(), "spike-03.openstreetmap.org."), - PTR(SWITCH1DUB_IPV4_HE.split(".").pop(), "switch1.dub.openstreetmap.org.") + PTR(CULEBRE_IPV4_HE, "culebre.openstreetmap.org."), + PTR(FAFNIR_IPV4_HE, "fafnir.openstreetmap.org."), + PTR(FUME_IPV4_HE, "fume.openstreetmap.org."), + PTR(GRISU_IPV4_HE, "grisu.openstreetmap.org."), + PTR(HORNTAIL_IPV4_HE, "horntail.openstreetmap.org."), + PTR(IDRIS_IPV4_HE, "idris.openstreetmap.org."), + PTR(KONQI_IPV4_HE, "konqi.openstreetmap.org."), + PTR(LONGMA_IPV4_HE, "longma.openstreetmap.org."), + PTR(MUIRDRIS_IPV4_HE, "muirdris.openstreetmap.org."), + PTR(NAGA_IPV4_HE, "naga.openstreetmap.org."), + PTR(SMAUG_IPV4_HE, "smaug.openstreetmap.org."), + PTR(SPIKE01_IPV4_HE, "spike-01.openstreetmap.org."), + PTR(SPIKE02_IPV4_HE, "spike-02.openstreetmap.org."), + PTR(SPIKE03_IPV4_HE, "spike-03.openstreetmap.org."), + PTR(SWITCH1DUB_IPV4_HE, "switch1.dub.openstreetmap.org.") ); -- 2.39.5