From 24b9f96d9c33184d700ec775c38a9970fb7a570f Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 13 Jan 2025 21:38:07 +0000 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 04/16] 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 From e2cdaff42b954092f157dc5c6c0cb46a58e49e85 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 21 Jan 2025 17:36:49 +0000 Subject: [PATCH 05/16] Add missing OS and AGRI HTTPS records --- src/openstreetmap.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index d2beb44..cd910b2 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -494,6 +494,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("b.agri", LOCKHEED_IPV6), A("c.agri", LOCKHEED_IPV4), AAAA("c.agri", LOCKHEED_IPV6), + + // HTTPS / SVCB records + HTTPS("agri", 1, ".", "alpn=h2"), + HTTPS("a.agri", 1, ".", "alpn=h2"), + 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), @@ -503,6 +510,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("c.os", LOCKHEED_IPV4), AAAA("c.os", LOCKHEED_IPV6), + // HTTPS / SVCB records + HTTPS("os", 1, ".", "alpn=h2"), + HTTPS("a.os", 1, ".", "alpn=h2"), + HTTPS("b.os", 1, ".", "alpn=h2"), + HTTPS("c.os", 1, ".", "alpn=h2"), + // Prometheus server and munin redirect -- 2.39.5 From c9ae1f2330b7c51d74f28df2e35c89f0fe9b8fd3 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 23 Jan 2025 20:33:57 +0000 Subject: [PATCH 06/16] Replace dynamic records logic with D_EXTEND --- dnsconfig.js | 31 ++++++++++++++++--------------- src/openstreetmap.js | 6 +----- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 77f9c0c..85c2f2d 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -14,11 +14,6 @@ function loadTemplate(template) { return function (domain, registrar) { DOMAIN = domain; REGISTRAR = registrar; - DYNAMIC_RECORDS = []; - - for (var i = 2; i < arguments.length; i++) { - DYNAMIC_RECORDS = DYNAMIC_RECORDS.concat(arguments[i]); - } require("src/" + template + ".js"); }; @@ -40,15 +35,7 @@ try { var GEO_NS_RECORDS = []; } -OPENSTREETMAP_ORG_RECORDS = [ - CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")) -] - -OSM_ORG_RECORDS = [ - CNAME("_acme-challenge.tile", "21gvdfyyxjoc4lmsem.fastly-validations.com.", TTL("10m")) -] - -OPENSTREETMAP("openstreetmap.org", REG_GANDI, OPENSTREETMAP_ORG_RECORDS, SSHFP_RECORDS, GEO_NS_RECORDS, NOMINATIM_RECORDS); +OPENSTREETMAP("openstreetmap.org", REG_GANDI); OPENSTREETMAP("openstreetmap.com", REG_GANDI); OPENSTREETMAP("openstreetmap.net", REG_GANDI); OPENSTREETMAP("openstreetmap.ca", REG_GANDI); @@ -56,7 +43,7 @@ OPENSTREETMAP("openstreetmap.eu", REG_NONE); OPENSTREETMAP("openstreetmap.pro", REG_GANDI); OPENSTREETMAP("openstreetmap.gay", REG_GANDI); OPENSTREETMAP("openstreetmaps.org", REG_GANDI); -OPENSTREETMAP("osm.org", REG_GANDI, OSM_ORG_RECORDS, SSHFP_RECORDS); +OPENSTREETMAP("osm.org", REG_GANDI); OPENSTREETMAP("openmaps.org", REG_GANDI); OPENSTREETMAP("openstreetmap.io", REG_GANDI); OPENSTREETMAP("osm.io", REG_GANDI); @@ -84,6 +71,20 @@ OPENSTREETMAP("openstreetmap.org.nz", REG_GANDI); // Disable due to registration issue // OPENSTREETMAP("openstreetmap.al", REG_NONE); +D_EXTEND("openstreetmap.org", + CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")), + + SSHFP_RECORDS, + GEO_NS_RECORDS, + NOMINATIM_RECORDS +); + +D_EXTEND("osm.org", + CNAME("_acme-challenge.tile", "21gvdfyyxjoc4lmsem.fastly-validations.com.", TTL("10m")), + + SSHFP_RECORDS +); + // Mastodon redirects to en.osm.town var OPENSTREETMAP_TOWN = loadTemplate("openstreetmap-town"); OPENSTREETMAP_TOWN("openstreetmap.town", REG_GANDI); diff --git a/src/openstreetmap.js b/src/openstreetmap.js index cd910b2..6bef817 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -805,10 +805,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Uptime site at StatusCake - CNAME("uptime", "uptimessl-new.statuscake.com."), - - // Dynamic DNS records - - DYNAMIC_RECORDS + CNAME("uptime", "uptimessl-new.statuscake.com.") ); -- 2.39.5 From dab85ec4e3fcc90bf66b120bcc16ff4f1a8f8022 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 23 Jan 2025 23:57:48 +0000 Subject: [PATCH 07/16] Rework storage of IP addresses --- dnsconfig.js | 3 +- src/hosts.js | 266 ------------- src/ideditor.js | 4 +- src/ipv4.json | 144 +++++++ src/ipv6.json | 62 +++ src/opengeodata.js | 8 +- src/openstreetmap-town.js | 4 +- src/openstreetmap-uk.js | 70 ++-- src/openstreetmap-za.js | 64 +-- src/openstreetmap.js | 754 ++++++++++++++++++------------------ src/osm-wiki.js | 24 +- src/osmfoundation.js | 36 +- src/ptr_equinix_ams_ipv4.js | 24 +- src/ptr_equinix_ams_ipv6.js | 24 +- src/ptr_equinix_dub_ipv4.js | 30 +- src/ptr_equinix_dub_ipv6.js | 30 +- src/ptr_he_dub_ipv4.js | 30 +- src/ptr_he_dub_ipv6.js | 30 +- src/stateofthemap.js | 62 +-- src/switch2osm.js | 8 +- 20 files changed, 809 insertions(+), 868 deletions(-) delete mode 100644 src/hosts.js create mode 100644 src/ipv4.json create mode 100644 src/ipv6.json diff --git a/dnsconfig.js b/dnsconfig.js index 85c2f2d..5deb02d 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -22,7 +22,8 @@ function loadTemplate(template) { // Ensure that the reverse DNS records are in RFC 4183 notation REVCOMPAT("rfc4183"); -require("src/hosts.js"); +var IPV4 = require("src/ipv4.json"); +var IPV6 = require("src/ipv6.json"); var OPENSTREETMAP = loadTemplate("openstreetmap"); diff --git a/src/hosts.js b/src/hosts.js deleted file mode 100644 index f886a9a..0000000 --- a/src/hosts.js +++ /dev/null @@ -1,266 +0,0 @@ -var ALBI_IPV4 = "51.159.53.238"; -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 CMOK_IPV4 = "64.225.143.127"; - -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"; - -var DRIBBLE_IPV4 = "82.199.86.100"; -var DRIBBLE_IPV6 = "2001:4d78:500:5e3::4"; -var DRIBBLE_INTERNAL = "10.0.48.4"; -var DRIBBLE_OOB = "10.0.49.4"; - -var DULCY_IPV4 = "82.199.86.105"; -var DULCY_IPV6 = "2001:4d78:500:5e3::9"; -var DULCY_INTERNAL = "10.0.48.9"; -var DULCY_OOB = "10.0.49.9"; - -var EDDIE_INTERNAL = "10.0.0.10"; -var EDDIE_OOB = "10.0.1.10"; - -var EQUINIXGWAMS_IPV4 = "82.199.86.73"; -var EQUINIXGWAMS_IPV6 = "2001:4d78:500:5e2::1"; - -var EQUINIXGW1AMS_IPV4 = "82.199.86.74"; -var EQUINIXGW1AMS_IPV6 = "2001:4d78:500:5e2::2"; - -var EQUINIXGW2AMS_IPV4 = "82.199.86.75"; -var EQUINIXGW2AMS_IPV6 = "2001:4d78:500:5e2::3"; - -var EQUINIXOSMAMS_IPV4 = "82.199.86.76"; -var EQUINIXOSMAMS_IPV6 = "2001:4d78:500:5e2::4"; - -var EQUINIXGWDUB_IPV4 = "87.252.218.105"; -var EQUINIXGWDUB_IPV6 = "2001:4d78:fe03:1b::1"; - -var EQUINIXGW1DUB_IPV4 = "87.252.218.106"; -var EQUINIXGW1DUB_IPV6 = "2001:4d78:fe03:1b::2"; - -var EQUINIXGW2DUB_IPV4 = "87.252.218.107"; -var EQUINIXGW2DUB_IPV6 = "2001:4d78:fe03:1b::3"; - -var EQUINIXOSMDUB_IPV4 = "87.252.218.108"; -var EQUINIXOSMDUB_IPV6 = "2001:4d78:fe03:1b::4"; - -var FAFFY_IPV4 = "82.199.86.99"; -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 = "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 = "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 = "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 = "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 = "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 = "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"; - -var KVM1_INTERNAL = "10.0.0.21"; - -var LADON_IPV4 = "83.212.2.116"; -var LADON_IPV6 = "2001:648:2ffe:4::116"; - -var LOCKHEED_IPV4 = "82.199.86.112"; -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 = "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 = "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 = "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"; - -var NEAK_IPV4 = "89.234.177.142"; - -var NIDHOGG_IPV4 = "194.71.11.111"; -var NIDHOGG_IPV6 = "2001:6b0:19:2::111"; -var NIDHOGG_OOB = "130.239.18.115"; - -var NORBERT_IPV4 = "82.199.86.113"; -var NORBERT_IPV6 = "2001:4d78:500:5e3::11"; -var NORBERT_INTERNAL = "10.0.48.17"; -var NORBERT_OOB = "10.0.49.17"; - -var ODIN_IPV4 = "82.199.86.111"; -var ODIN_IPV6 = "2001:4d78:500:5e3::f"; -var ODIN_INTERNAL = "10.0.48.15"; -var ODIN_OOB = "10.0.49.15"; - -var OOB1AMS_INTERNAL = "10.0.48.102"; - -var OOB1DUB_INTERNAL = "10.0.64.102"; - -var PALULUKON_IPV4 = "3.144.0.72"; - -var PIASA_IPV4 = "140.211.167.101"; -var PIASA_IPV6 = "2605:bc80:3010:700::8cd3:a765"; -var PIASA_OOB = "10.0.0.198"; - -var PDU1AMS_INTERNAL = "10.0.48.100"; - -var PDU2AMS_INTERNAL = "10.0.48.101"; - -var PDU1DUB_INTERNAL = "10.0.64.100"; - -var PDU2DUB_INTERNAL = "10.0.64.101"; - -var RHAEGAL_IPV4 = "193.198.233.218"; -var RHAEGAL_IPV6 = "2001:b68:40ff:3::2"; - -var RIDGEBACK_IPV4 = "31.169.50.10"; -var RIDGEBACK_OOB = "31.169.50.14"; - -var RIDLEY_IPV4 = "193.60.236.19"; -var RIDLEY_INTERNAL = "10.0.0.3"; -var RIDLEY_OOB = "10.0.1.3"; - -var SHENRON_IPV4 = "212.110.172.32"; -var SHENRON_IPV6 = "2001:41c9:1:400::32"; - -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"; - -var SNAP01_INTERNAL = "10.0.48.49"; -var SNAP01_OOB = "10.0.49.49"; - -var SNAP02_INTERNAL = "10.0.0.4"; -var SNAP02_OOB = "10.0.1.4"; - -var SNAP03_INTERNAL = "10.0.64.50"; -var SNAP03_OOB = "10.0.65.50"; - -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 = "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 = "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"; - -var SPIKE06_IPV4 = "82.199.86.102"; -var SPIKE06_IPV6 = "2001:4d78:500:5e3::6"; -var SPIKE06_INTERNAL = "10.0.48.6"; -var SPIKE06_OOB = "10.0.49.6"; - -var SPIKE07_IPV4 = "82.199.86.103"; -var SPIKE07_IPV6 = "2001:4d78:500:5e3::7"; -var SPIKE07_INTERNAL = "10.0.48.7"; -var SPIKE07_OOB = "10.0.49.7"; - -var SPIKE08_IPV4 = "82.199.86.104"; -var SPIKE08_IPV6 = "2001:4d78:500:5e3::8"; -var SPIKE08_INTERNAL = "10.0.48.8"; -var SPIKE08_OOB = "10.0.49.8"; - -var STORMFLY03_IPV4 = "140.211.167.99"; -var STORMFLY03_IPV6 = "2605:bc80:3010:700::8cd3:a763"; -var STORMFLY03_OOB = "10.0.0.2"; - -var STORMFLY04_IPV4 = "140.211.167.100"; -var STORMFLY04_IPV6 = "2605:bc80:3010:700::8cd3:a764"; -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 = "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"; -var TABALUGA_INTERNAL = "10.0.48.14"; -var TABALUGA_OOB = "10.0.49.14"; - -var VHAGAR_IPV4 = "82.199.86.101"; -var VHAGAR_IPV6 = "2001:4d78:500:5e3::5"; -var VHAGAR_INTERNAL = "10.0.48.5"; -var VHAGAR_OOB = "10.0.49.5"; - -var WAWEL_IPV4 = "64.225.136.96"; - -var YSERA_IPV4 = "193.60.236.22"; -var YSERA_INTERNAL = "10.0.0.15"; -var YSERA_OOB = "10.0.1.15"; diff --git a/src/ideditor.js b/src/ideditor.js index 3faa1e2..3c61fd4 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_HE), - AAAA("preview", NAGA_IPV6_HE) + A("preview", IPV4["naga.he"]), + AAAA("preview", IPV6["naga.he"]) ); diff --git a/src/ipv4.json b/src/ipv4.json new file mode 100644 index 0000000..0b805bd --- /dev/null +++ b/src/ipv4.json @@ -0,0 +1,144 @@ +{ + "albi": "51.159.53.238", + "angor": "196.10.54.165", + "cmok": "64.225.143.127" + "culebre": "87.252.214.105", + "culebre.he": "184.104.226.105", + "culebre.dub": "10.0.64.9", + "culebre.oob": "10.0.65.9" + "dribble": "82.199.86.100", + "dribble.ams": "10.0.48.4", + "dribble.oob": "10.0.49.4" + "dulcy": "82.199.86.105", + "dulcy.ams": "10.0.48.9", + "dulcy.oob": "10.0.49.9" + "eddie.ucl": "10.0.0.10", + "eddie.oob": "10.0.1.10", + "equinix-gw.ams": "82.199.86.73", + "equinix-gw-1.ams": "82.199.86.74", + "equinix-gw-2.ams": "82.199.86.75", + "equinix-osm.ams": "82.199.86.76", + "equinix-gw.dub": "87.252.218.105", + "equinix-gw-1.dub": "87.252.218.106", + "equinix-gw-2.dub": "87.252.218.107", + "equinix-osm.dub": "87.252.218.108", + "faffy": "82.199.86.99", + "faffy.ams": "10.0.48.3", + "faffy.oob": "10.0.49.3" + "fafnir": "87.252.214.98", + "fafnir.he": "184.104.226.98", + "fafnir.dub": "10.0.64.2", + "fafnir.oob": "10.0.65.2" + "fume": "87.252.214.112", + "fume.he": "184.104.226.112", + "fume.dub": "10.0.64.16", + "fume.oob": "10.0.65.16" + "grisu": "87.252.214.113", + "grisu.he": "184.104.226.113", + "grisu.dub": "10.0.64.17", + "grisu.oob": "10.0.65.17" + "horntail": "87.252.214.106", + "horntail.he": "184.104.226.106", + "horntail.dub": "10.0.64.10", + "horntail.oob": "10.0.65.10" + "idris": "87.252.214.102", + "idris.he": "184.104.226.102", + "idris.dub": "10.0.64.6", + "idris.oob": "10.0.65.6" + "karm.ams": "10.0.48.50", + "karm.oob": "10.0.49.50" + "konqi": "87.252.214.103", + "konqi.he": "184.104.226.103", + "konqi.dub": "10.0.64.7", + "konqi.oob": "10.0.65.7" + "ladon": "83.212.2.116", + "lockheed": "82.199.86.112", + "lockheed.ams": "10.0.48.16", + "lockheed.oob": "10.0.49.16" + "longma": "87.252.214.109", + "longma.he": "184.104.226.109", + "longma.dub": "10.0.64.13", + "longma.oob": "10.0.65.13" + "meraxes": "51.15.185.90", + "muirdris": "87.252.214.111", + "muirdris.he": "184.104.226.111", + "muirdris.dub": "10.0.64.15", + "muirdris.oob": "10.0.65.15" + "naga": "87.252.214.104", + "naga.he": "184.104.226.104", + "naga.dub": "10.0.64.8", + "naga.oob": "10.0.65.8" + "neak": "89.234.177.142" + "nidhogg": "194.71.11.111", + "nidhogg.oob": "130.239.18.115" + "norbert": "82.199.86.113", + "norbert.ams": "10.0.48.17", + "norbert.oob": "10.0.49.17" + "odin": "82.199.86.111", + "odin.ams": "10.0.48.15", + "odin.oob": "10.0.49.15" + "oob1.ams": "10.0.48.102" + "oob1.dub": "10.0.64.102" + "palulukon": "3.144.0.72" + "piasa": "140.211.167.101", + "piasa.oob": "10.0.0.198" + "pdu1.ams": "10.0.48.100" + "pdu2.ams": "10.0.48.101" + "pdu1.dub": "10.0.64.100" + "pdu2.dub": "10.0.64.101" + "rhaegal": "193.198.233.218", + "ridgeback": "31.169.50.10", + "ridgeback.oob": "31.169.50.14" + "ridley": "193.60.236.19", + "ridley.ucl": "10.0.0.3", + "ridley.oob": "10.0.1.3" + "shenron": "212.110.172.32", + "smaug": "87.252.214.110", + "smaug.he": "184.104.226.110", + "smaug.dub": "10.0.64.14", + "smaug.oob": "10.0.65.14" + "snap-01.ams": "10.0.48.49", + "snap-01.oob": "10.0.49.49" + "snap-02.ucl": "10.0.0.4", + "snap-02.oob": "10.0.1.4" + "snap-03.dub": "10.0.64.50", + "snap-03.oob": "10.0.65.50" + "spike-01": "87.252.214.99", + "spike-01.he": "184.104.226.99", + "spike-01.dub": "10.0.64.3", + "spike-01.oob": "10.0.65.3" + "spike-02": "87.252.214.100", + "spike-02.he": "184.104.226.100", + "spike-02.dub": "10.0.64.4", + "spike-02.oob": "10.0.65.4" + "spike-03": "87.252.214.101", + "spike-03.he": "184.104.226.101", + "spike-03.dub": "10.0.64.5", + "spike-03.oob": "10.0.65.5", + "spike-06": "82.199.86.102", + "spike-06.ams": "10.0.48.6", + "spike-06.oob": "10.0.49.6" + "spike-07": "82.199.86.103", + "spike-07.ams": "10.0.48.7", + "spike-07.oob": "10.0.49.7" + "spike-08": "82.199.86.104", + "spike-08.ams": "10.0.48.8", + "spike-08.oob": "10.0.49.8" + "stormfly-03": "140.211.167.99", + "stormfly-03.oob": "10.0.0.2" + "stormfly-04": "140.211.167.100", + "stormfly-04.oob": "10.0.0.3" + "switch1.ams": "82.199.86.97", + "switch1.dub": "87.252.214.97", + "switch1.he.dub": "184.104.226.97", + "tabaluga": "82.199.86.110", + "tabaluga.ams": "10.0.48.14", + "tabaluga.oob": "10.0.49.14" + "vhagar": "82.199.86.101", + "vhagar.ams": "10.0.48.5", + "vhagar.oob": "10.0.49.5", + "wawel": "64.225.136.96" + "ysera": "193.60.236.22", + "ysera.ucl": "10.0.0.15", + "ysera.oob": "10.0.1.15" +} diff --git a/src/ipv6.json b/src/ipv6.json new file mode 100644 index 0000000..6e0b81b --- /dev/null +++ b/src/ipv6.json @@ -0,0 +1,62 @@ +{ + "albi": "2001:0bc8:1200:0004:dac4:97ff:fe8a:9cfc", + "angor": "2001:43f8:1f4:b00:b283:feff:fed8:dd45", + "culebre": "2001:4d78:fe03:1c::9", + "culebre.he": "2001:470:1:b3b::9", + "dribble": "2001:4d78:500:5e3::4", + "dulcy": "2001:4d78:500:5e3::9", + "equinix-gw.ams": "2001:4d78:500:5e2::1" + "equinix-gw-1.ams": "2001:4d78:500:5e2::2" + "equinix-gw-2.ams": "2001:4d78:500:5e2::3", + "equinix-osm.ams": "2001:4d78:500:5e2::4" + "equinix-gw.dub": "2001:4d78:fe03:1b::1" + "equinix-gw-1.dub": "2001:4d78:fe03:1b::2" + "equinix-gw-2.dub": "2001:4d78:fe03:1b::3" + "equinix-osm.dub": "2001:4d78:fe03:1b::4" + "faffy": "2001:4d78:500:5e3::3", + "fafnir": "2001:4d78:fe03:1c::2", + "fafnir.he": "2001:470:1:b3b::2", + "fume": "2001:4d78:fe03:1c::10", + "fume.he": "2001:470:1:b3b::10", + "grisu": "2001:4d78:fe03:1c::11", + "grisu.he": "2001:470:1:b3b::11", + "horntail": "2001:4d78:fe03:1c::a", + "horntail.he": "2001:470:1:b3b::a", + "idris": "2001:4d78:fe03:1c::6", + "idris.he": "2001:470:1:b3b::6", + "konqi": "2001:4d78:fe03:1c::7", + "konqi.he": "2001:470:1:b3b::7", + "ladon": "2001:648:2ffe:4::116" + "lockheed": "2001:4d78:500:5e3::10", + "longma": "2001:4d78:fe03:1c::d", + "longma.he": "2001:470:1:b3b::d", + "meraxes": "2001:bc8:2d57:100:aa1e:84ff:fe72:e660" + "muirdris": "2001:4d78:fe03:1c::f", + "muirdris.he": "2001:470:1:b3b::f", + "naga": "2001:4d78:fe03:1c::8", + "naga.he": "2001:470:1:b3b::8", + "nidhogg": "2001:6b0:19:2::111", + "norbert": "2001:4d78:500:5e3::11", + "odin": "2001:4d78:500:5e3::f", + "piasa": "2605:bc80:3010:700::8cd3:a765", + "rhaegal": "2001:b68:40ff:3::2" + "shenron": "2001:41c9:1:400::32" + "smaug": "2001:4d78:fe03:1c::e", + "smaug.he": "2001:470:1:b3b::e", + "spike-01": "2001:4d78:fe03:1c::3", + "spike-01.he": "2001:470:1:b3b::3", + "spike-02": "2001:4d78:fe03:1c::4", + "spike-02.he": "2001:470:1:b3b::4", + "spike-03": "2001:4d78:fe03:1c::5", + "spike-03.he": "2001:470:1:b3b::5", + "spike-06": "2001:4d78:500:5e3::6", + "spike-07": "2001:4d78:500:5e3::7", + "spike-08": "2001:4d78:500:5e3::8", + "stormfly-03": "2605:bc80:3010:700::8cd3:a763", + "stormfly-04": "2605:bc80:3010:700::8cd3:a764", + "switch1.ams": "2001:4d78:500:5e3::1" + "switch1.dub": "2001:4d78:fe03:1c::1", + "switch1.he.dub": "2001:470:1:b3b::1" + "tabaluga": "2001:4d78:500:5e3::e", + "vhagar": "2001:4d78:500:5e3::5" +} diff --git a/src/opengeodata.js b/src/opengeodata.js index f7824f2..807df1f 100644 --- a/src/opengeodata.js +++ b/src/opengeodata.js @@ -26,8 +26,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", RIDLEY_IPV4), - A("old", RIDLEY_IPV4), // Legacy URL support https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/ - A("www", RIDLEY_IPV4) + A("@", IPV4["ridley"]), + A("old", IPV4["ridley"]), // Legacy URL support https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/ + A("www", IPV4["ridley"]) -); \ No newline at end of file +); diff --git a/src/openstreetmap-town.js b/src/openstreetmap-town.js index ab3d792..e3e0076 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_HE), - AAAA("en", NAGA_IPV6_HE) + A("en", IPV4["naga.he"]), + AAAA("en", IPV6["naga.he"]) ); diff --git a/src/openstreetmap-uk.js b/src/openstreetmap-uk.js index 5cce6eb..bf5d97f 100644 --- a/src/openstreetmap-uk.js +++ b/src/openstreetmap-uk.js @@ -44,40 +44,40 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Aerial imagery sites - A("hampshire.aerial", LOCKHEED_IPV4), - AAAA("hampshire.aerial", LOCKHEED_IPV6), - A("a.hampshire.aerial", LOCKHEED_IPV4), - AAAA("a.hampshire.aerial", LOCKHEED_IPV6), - A("b.hampshire.aerial", LOCKHEED_IPV4), - AAAA("b.hampshire.aerial", LOCKHEED_IPV6), - A("c.hampshire.aerial", LOCKHEED_IPV4), - AAAA("c.hampshire.aerial", LOCKHEED_IPV6), - - A("surrey.aerial", LOCKHEED_IPV4), - AAAA("surrey.aerial", LOCKHEED_IPV6), - A("a.surrey.aerial", LOCKHEED_IPV4), - AAAA("a.surrey.aerial", LOCKHEED_IPV6), - A("b.surrey.aerial", LOCKHEED_IPV4), - AAAA("b.surrey.aerial", LOCKHEED_IPV6), - A("c.surrey.aerial", LOCKHEED_IPV4), - AAAA("c.surrey.aerial", 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), - - A("ea", LOCKHEED_IPV4), - AAAA("ea", LOCKHEED_IPV6), - A("a.ea", LOCKHEED_IPV4), - AAAA("a.ea", LOCKHEED_IPV6), - A("b.ea", LOCKHEED_IPV4), - AAAA("b.ea", LOCKHEED_IPV6), - A("c.ea", LOCKHEED_IPV4), - AAAA("c.ea", LOCKHEED_IPV6) + A("hampshire.aerial", IPV4["lockheed"]), + AAAA("hampshire.aerial", IPV6["lockheed"]), + A("a.hampshire.aerial", IPV4["lockheed"]), + AAAA("a.hampshire.aerial", IPV6["lockheed"]), + A("b.hampshire.aerial", IPV4["lockheed"]), + AAAA("b.hampshire.aerial", IPV6["lockheed"]), + A("c.hampshire.aerial", IPV4["lockheed"]), + AAAA("c.hampshire.aerial", IPV6["lockheed"]), + + A("surrey.aerial", IPV4["lockheed"]), + AAAA("surrey.aerial", IPV6["lockheed"]), + A("a.surrey.aerial", IPV4["lockheed"]), + AAAA("a.surrey.aerial", IPV6["lockheed"]), + A("b.surrey.aerial", IPV4["lockheed"]), + AAAA("b.surrey.aerial", IPV6["lockheed"]), + A("c.surrey.aerial", IPV4["lockheed"]), + AAAA("c.surrey.aerial", IPV6["lockheed"]), + + 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"]), + + A("ea", IPV4["lockheed"]), + AAAA("ea", IPV6["lockheed"]), + A("a.ea", IPV4["lockheed"]), + AAAA("a.ea", IPV6["lockheed"]), + A("b.ea", IPV4["lockheed"]), + AAAA("b.ea", IPV6["lockheed"]), + A("c.ea", IPV4["lockheed"]), + AAAA("c.ea", IPV6["lockheed"]) ); diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js index 5ea5992..cd4a20e 100644 --- a/src/openstreetmap-za.js +++ b/src/openstreetmap-za.js @@ -40,14 +40,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Aerial imagery sites - A("aerial", LOCKHEED_IPV4), - AAAA("aerial", LOCKHEED_IPV6), - A("a.aerial", LOCKHEED_IPV4), - AAAA("a.aerial", LOCKHEED_IPV6), - A("b.aerial", LOCKHEED_IPV4), - AAAA("b.aerial", LOCKHEED_IPV6), - A("c.aerial", LOCKHEED_IPV4), - AAAA("c.aerial", LOCKHEED_IPV6), + A("aerial", IPV4["lockheed"]), + AAAA("aerial", IPV6["lockheed"]), + A("a.aerial", IPV4["lockheed"]), + AAAA("a.aerial", IPV6["lockheed"]), + A("b.aerial", IPV4["lockheed"]), + AAAA("b.aerial", IPV6["lockheed"]), + A("c.aerial", IPV4["lockheed"]), + AAAA("c.aerial", IPV6["lockheed"]), // HTTPS / SVCB records HTTPS("aerial", 1, ".", "alpn=h2"), @@ -55,14 +55,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), HTTPS("b.aerial", 1, ".", "alpn=h2"), HTTPS("c.aerial", 1, ".", "alpn=h2"), - A("coct.aerial", LOCKHEED_IPV4), - AAAA("coct.aerial", LOCKHEED_IPV6), - A("a.coct.aerial", LOCKHEED_IPV4), - AAAA("a.coct.aerial", LOCKHEED_IPV6), - A("b.coct.aerial", LOCKHEED_IPV4), - AAAA("b.coct.aerial", LOCKHEED_IPV6), - A("c.coct.aerial", LOCKHEED_IPV4), - AAAA("c.coct.aerial", LOCKHEED_IPV6), + A("coct.aerial", IPV4["lockheed"]), + AAAA("coct.aerial", IPV6["lockheed"]), + A("a.coct.aerial", IPV4["lockheed"]), + AAAA("a.coct.aerial", IPV6["lockheed"]), + A("b.coct.aerial", IPV4["lockheed"]), + AAAA("b.coct.aerial", IPV6["lockheed"]), + A("c.coct.aerial", IPV4["lockheed"]), + AAAA("c.coct.aerial", IPV6["lockheed"]), // HTTPS / SVCB records HTTPS("coct.aerial", 1, ".", "alpn=h2"), @@ -70,14 +70,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), HTTPS("b.coct.aerial", 1, ".", "alpn=h2"), HTTPS("c.coct.aerial", 1, ".", "alpn=h2"), - A("topo", LOCKHEED_IPV4), - AAAA("topo", LOCKHEED_IPV6), - A("a.topo", LOCKHEED_IPV4), - AAAA("a.topo", LOCKHEED_IPV6), - A("b.topo", LOCKHEED_IPV4), - AAAA("b.topo", LOCKHEED_IPV6), - A("c.topo", LOCKHEED_IPV4), - AAAA("c.topo", LOCKHEED_IPV6), + A("topo", IPV4["lockheed"]), + AAAA("topo", IPV6["lockheed"]), + A("a.topo", IPV4["lockheed"]), + AAAA("a.topo", IPV6["lockheed"]), + A("b.topo", IPV4["lockheed"]), + AAAA("b.topo", IPV6["lockheed"]), + A("c.topo", IPV4["lockheed"]), + AAAA("c.topo", IPV6["lockheed"]), // HTTPS / SVCB records HTTPS("topo", 1, ".", "alpn=h2"), @@ -85,14 +85,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), HTTPS("b.topo", 1, ".", "alpn=h2"), HTTPS("c.topo", 1, ".", "alpn=h2"), - A("namibia-topo", LOCKHEED_IPV4), - AAAA("namibia-topo", LOCKHEED_IPV6), - A("a.namibia-topo", LOCKHEED_IPV4), - AAAA("a.namibia-topo", LOCKHEED_IPV6), - A("b.namibia-topo", LOCKHEED_IPV4), - AAAA("b.namibia-topo", LOCKHEED_IPV6), - A("c.namibia-topo", LOCKHEED_IPV4), - AAAA("c.namibia-topo", LOCKHEED_IPV6), + A("namibia-topo", IPV4["lockheed"]), + AAAA("namibia-topo", IPV6["lockheed"]), + A("a.namibia-topo", IPV4["lockheed"]), + AAAA("a.namibia-topo", IPV6["lockheed"]), + A("b.namibia-topo", IPV4["lockheed"]), + AAAA("b.namibia-topo", IPV6["lockheed"]), + A("c.namibia-topo", IPV4["lockheed"]), + AAAA("c.namibia-topo", IPV6["lockheed"]), // HTTPS / SVCB records HTTPS("namibia-topo", 1, ".", "alpn=h2"), 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"), diff --git a/src/osm-wiki.js b/src/osm-wiki.js index 3fb4add..b7aaf1f 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_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"]), // 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_HE), - AAAA("wiki", KONQI_IPV6_HE), - A("www", KONQI_IPV4_HE), - AAAA("www", KONQI_IPV6_HE), - A("@", KONQI_IPV4_HE), - AAAA("@", KONQI_IPV6_HE) + A("wiki", IPV4["konqi.he"]), + AAAA("wiki", IPV6["konqi.he"]), + A("www", IPV4["konqi.he"]), + AAAA("www", IPV6["konqi.he"]), + A("@", IPV4["konqi.he"]), + AAAA("@", IPV6["konqi.he"]) ); diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 78cb4ff..cbb22d2 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -103,21 +103,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", RIDLEY_IPV4), - A("www", RIDLEY_IPV4), - A("wiki", RIDLEY_IPV4), - A("blog", RIDLEY_IPV4), - A("crm", RIDLEY_IPV4), - A("join", RIDLEY_IPV4), - A("support", RIDLEY_IPV4), - A("supporting", RIDLEY_IPV4), - A("donate", RIDLEY_IPV4), - - A("board", RIDLEY_IPV4), - A("dwg", RIDLEY_IPV4), - A("mwg", RIDLEY_IPV4), - A("operations", NAGA_IPV4_HE), - AAAA("operations", NAGA_IPV6_HE), + A("@", IPV4["ridley"]), + A("www", IPV4["ridley"]), + A("wiki", IPV4["ridley"]), + A("blog", IPV4["ridley"]), + A("crm", IPV4["ridley"]), + A("join", IPV4["ridley"]), + A("support", IPV4["ridley"]), + A("supporting", IPV4["ridley"]), + A("donate", IPV4["ridley"]), + + A("board", IPV4["ridley"]), + A("dwg", IPV4["ridley"]), + A("mwg", IPV4["ridley"]), + A("operations", IPV4["naga.he"]), + AAAA("operations", IPV6["naga.he"]), // HTTPS / SVCB records HTTPS("www", 1, ".", "alpn=h2"), @@ -138,12 +138,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."), // Staging Blog - 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("hardware", IDRIS_IPV4_HE), + A("hardware", IPV4["idris.he"]), // HTTPS / SVCB records HTTPS("hardware", 1, ".", "alpn=h2") diff --git a/src/ptr_equinix_ams_ipv4.js b/src/ptr_equinix_ams_ipv4.js index 88b7b65..b8afdd7 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, "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.") + PTR(IPV4["dribble"], "dribble.openstreetmap.org."), + PTR(IPV4["dulcy"], "dulcy.openstreetmap.org."), + PTR(IPV4["faffy"], "faffy.openstreetmap.org."), + PTR(IPV4["lockheed"], "lockheed.openstreetmap.org."), + PTR(IPV4["norbert"], "norbert.openstreetmap.org."), + PTR(IPV4["odin"], "odin.openstreetmap.org."), + PTR(IPV4["spike-06"], "spike-06.openstreetmap.org."), + PTR(IPV4["spike-07"], "spike-07.openstreetmap.org."), + PTR(IPV4["spike-08"], "spike-08.openstreetmap.org."), + PTR(IPV4["tabaluga"], "tabaluga.openstreetmap.org."), + PTR(IPV4["vhagar"], "vhagar.openstreetmap.org."), + PTR(IPV4["switch1.ams"], "switch1.ams.openstreetmap.org.") ); diff --git a/src/ptr_equinix_ams_ipv6.js b/src/ptr_equinix_ams_ipv6.js index 28c4bb5..f20a51b 100644 --- a/src/ptr_equinix_ams_ipv6.js +++ b/src/ptr_equinix_ams_ipv6.js @@ -1,14 +1,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(DRIBBLE_IPV6, "dribble.openstreetmap.org."), - PTR(DULCY_IPV6, "dulcy.openstreetmap.org."), - PTR(FAFFY_IPV6, "faffy.openstreetmap.org."), - PTR(LOCKHEED_IPV6, "lockheed.openstreetmap.org."), - PTR(NORBERT_IPV6, "norbert.openstreetmap.org."), - PTR(ODIN_IPV6, "odin.openstreetmap.org."), - PTR(SPIKE06_IPV6, "spike-06.openstreetmap.org."), - PTR(SPIKE07_IPV6, "spike-07.openstreetmap.org."), - PTR(SPIKE08_IPV6, "spike-08.openstreetmap.org."), - PTR(VHAGAR_IPV6, "vhagar.openstreetmap.org."), - PTR(TABALUGA_IPV6, "tabaluga.openstreetmap.org."), - PTR(SWITCH1AMS_IPV6, "switch1.ams.openstreetmap.org.") + PTR(IPV6["dribble"], "dribble.openstreetmap.org."), + PTR(IPV6["dulcy"], "dulcy.openstreetmap.org."), + PTR(IPV6["faffy"], "faffy.openstreetmap.org."), + PTR(IPV6["lockheed"], "lockheed.openstreetmap.org."), + PTR(IPV6["norbert"], "norbert.openstreetmap.org."), + PTR(IPV6["odin"], "odin.openstreetmap.org."), + PTR(IPV6["spike-06"], "spike-06.openstreetmap.org."), + PTR(IPV6["spike-07"], "spike-07.openstreetmap.org."), + PTR(IPV6["spike-08"], "spike-08.openstreetmap.org."), + PTR(IPV6["vhagar"], "vhagar.openstreetmap.org."), + PTR(IPV6["tabaluga"], "tabaluga.openstreetmap.org."), + PTR(IPV6["switch1.ams"], "switch1.ams.openstreetmap.org.") ); diff --git a/src/ptr_equinix_dub_ipv4.js b/src/ptr_equinix_dub_ipv4.js index ff073e9..f341ead 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, "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.") + PTR(IPV4["culebre"], "culebre.openstreetmap.org."), + PTR(IPV4["fafnir"], "fafnir.openstreetmap.org."), + PTR(IPV4["fume"], "fume.openstreetmap.org."), + PTR(IPV4["grisu"], "grisu.openstreetmap.org."), + PTR(IPV4["horntail"], "horntail.openstreetmap.org."), + PTR(IPV4["idris"], "idris.openstreetmap.org."), + PTR(IPV4["konqi"], "konqi.openstreetmap.org."), + PTR(IPV4["longma"], "longma.openstreetmap.org."), + PTR(IPV4["muirdris"], "muirdris.openstreetmap.org."), + PTR(IPV4["naga"], "naga.openstreetmap.org."), + PTR(IPV4["smaug"], "smaug.openstreetmap.org."), + PTR(IPV4["spike-01"], "spike-01.openstreetmap.org."), + PTR(IPV4["spike-02"], "spike-02.openstreetmap.org."), + PTR(IPV4["spike-03"], "spike-03.openstreetmap.org."), + PTR(IPV4["switch1.dub"], "switch1.dub.openstreetmap.org.") ); diff --git a/src/ptr_equinix_dub_ipv6.js b/src/ptr_equinix_dub_ipv6.js index 2416673..e06c3e7 100644 --- a/src/ptr_equinix_dub_ipv6.js +++ b/src/ptr_equinix_dub_ipv6.js @@ -1,17 +1,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(CULEBRE_IPV6, "culebre.openstreetmap.org."), - PTR(FAFNIR_IPV6, "fafnir.openstreetmap.org."), - PTR(FUME_IPV6, "fume.openstreetmap.org."), - PTR(GRISU_IPV6, "grisu.openstreetmap.org."), - PTR(HORNTAIL_IPV6, "horntail.openstreetmap.org."), - PTR(IDRIS_IPV6, "idris.openstreetmap.org."), - PTR(KONQI_IPV6, "konqi.openstreetmap.org."), - PTR(LONGMA_IPV6, "longma.openstreetmap.org."), - PTR(MUIRDRIS_IPV6.split(".").pop(), "muirdris.openstreetmap.org."), - PTR(NAGA_IPV6, "naga.openstreetmap.org."), - PTR(SMAUG_IPV6.split(".").pop(), "smaug.openstreetmap.org."), - PTR(SPIKE01_IPV6, "spike-01.openstreetmap.org."), - PTR(SPIKE02_IPV6, "spike-02.openstreetmap.org."), - PTR(SPIKE03_IPV6, "spike-03.openstreetmap.org."), - PTR(SWITCH1DUB_IPV6, "switch1.dub.openstreetmap.org.") + PTR(IPV6["culebre"], "culebre.openstreetmap.org."), + PTR(IPV6["fafnir"], "fafnir.openstreetmap.org."), + PTR(IPV6["fume"], "fume.openstreetmap.org."), + PTR(IPV6["grisu"], "grisu.openstreetmap.org."), + PTR(IPV6["horntail"], "horntail.openstreetmap.org."), + PTR(IPV6["idris"], "idris.openstreetmap.org."), + PTR(IPV6["konqi"], "konqi.openstreetmap.org."), + PTR(IPV6["longma"], "longma.openstreetmap.org."), + PTR(IPV6["muirdris"], "muirdris.openstreetmap.org."), + PTR(IPV6["naga"], "naga.openstreetmap.org."), + PTR(IPV6["smaug"], "smaug.openstreetmap.org."), + PTR(IPV6["spike-01"], "spike-01.openstreetmap.org."), + PTR(IPV6["spike-02"], "spike-02.openstreetmap.org."), + PTR(IPV6["spike-03"], "spike-03.openstreetmap.org."), + PTR(IPV6["switch1.dub"], "switch1.dub.openstreetmap.org.") ); diff --git a/src/ptr_he_dub_ipv4.js b/src/ptr_he_dub_ipv4.js index 407a989..9ee2839 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, "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.") + PTR(IPV4["culebre.he"], "culebre.openstreetmap.org."), + PTR(IPV4["fafnir.he"], "fafnir.openstreetmap.org."), + PTR(IPV4["fume.he"], "fume.openstreetmap.org."), + PTR(IPV4["grisu.he"], "grisu.openstreetmap.org."), + PTR(IPV4["horntail.he"], "horntail.openstreetmap.org."), + PTR(IPV4["idris.he"], "idris.openstreetmap.org."), + PTR(IPV4["konqi.he"], "konqi.openstreetmap.org."), + PTR(IPV4["longma.he"], "longma.openstreetmap.org."), + PTR(IPV4["muirdris.he"], "muirdris.openstreetmap.org."), + PTR(IPV4["naga.he"], "naga.openstreetmap.org."), + PTR(IPV4["smaug.he"], "smaug.openstreetmap.org."), + PTR(IPV4["spike-01.he"], "spike-01.openstreetmap.org."), + PTR(IPV4["spike-02.he"], "spike-02.openstreetmap.org."), + PTR(IPV4["spike-03.he"], "spike-03.openstreetmap.org."), + PTR(IPV4["switch1.he.dub"], "switch1.dub.openstreetmap.org.") ); diff --git a/src/ptr_he_dub_ipv6.js b/src/ptr_he_dub_ipv6.js index 8e94546..95ae717 100644 --- a/src/ptr_he_dub_ipv6.js +++ b/src/ptr_he_dub_ipv6.js @@ -1,17 +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.") + PTR(IPV6["culebre.he"], "culebre.openstreetmap.org."), + PTR(IPV6["fafnir.he"], "fafnir.openstreetmap.org."), + PTR(IPV6["fume.he"], "fume.openstreetmap.org."), + PTR(IPV6["grisu.he"], "grisu.openstreetmap.org."), + PTR(IPV6["horntail.he"], "horntail.openstreetmap.org."), + PTR(IPV6["idris.he"], "idris.openstreetmap.org."), + PTR(IPV6["konqi.he"], "konqi.openstreetmap.org."), + PTR(IPV6["longma.he"], "longma.openstreetmap.org."), + PTR(IPV6["muirdris.he"], "muirdris.openstreetmap.org."), + PTR(IPV6["naga.he"], "naga.openstreetmap.org."), + PTR(IPV6["smaug.he"], "smaug.openstreetmap.org."), + PTR(IPV6["spike-01.he"], "spike-01.openstreetmap.org."), + PTR(IPV6["spike-02.he"], "spike-02.openstreetmap.org."), + PTR(IPV6["spike-03.he"], "spike-03.openstreetmap.org."), + PTR(IPV6["switch1.he.dub"], "switch1.dub.openstreetmap.org.") ); diff --git a/src/stateofthemap.js b/src/stateofthemap.js index ec03526..efe3912 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_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_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), + A("@", IPV4["naga.he"]), + AAAA("@", IPV6["naga.he"]), + A("www", IPV4["naga.he"]), + AAAA("www", IPV6["naga.he"]), + A("2024", IPV4["naga.he"]), + AAAA("2024", IPV6["naga.he"]), + A("2022", IPV4["naga.he"]), + AAAA("2022", IPV6["naga.he"]), + A("2021", IPV4["naga.he"]), + AAAA("2021", IPV6["naga.he"]), + A("2020", IPV4["naga.he"]), + AAAA("2020", IPV6["naga.he"]), + A("2019", IPV4["naga.he"]), + AAAA("2019", IPV6["naga.he"]), + A("2018", IPV4["naga.he"]), + AAAA("2018", IPV6["naga.he"]), + A("2017", IPV4["naga.he"]), + AAAA("2017", IPV6["naga.he"]), + A("2016", IPV4["naga.he"]), + AAAA("2016", IPV6["naga.he"]), + A("2013", IPV4["naga.he"]), + AAAA("2013", IPV6["naga.he"]), + A("2012", IPV4["ridley"]), + A("2011", IPV4["ridley"]), + A("2010", IPV4["ridley"]), + A("2009", IPV4["naga.he"]), + AAAA("2009", IPV6["naga.he"]), + A("2008", IPV4["naga.he"]), + AAAA("2008", IPV6["naga.he"]), + A("2007", IPV4["naga.he"]), + AAAA("2007", IPV6["naga.he"]), // HTTPS / SVCB records HTTPS("@", 1, ".", "alpn=h2"), diff --git a/src/switch2osm.js b/src/switch2osm.js index 339a4f1..16ff39c 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_HE), - AAAA("@", NAGA_IPV6_HE), - A("www", NAGA_IPV4_HE), - AAAA("www", NAGA_IPV6_HE), + A("@", IPV4["naga.he"]), + AAAA("@", IPV6["naga.he"]), + A("www", IPV4["naga.he"]), + AAAA("www", IPV6["naga.he"]), // HTTPS / SVCB records HTTPS("@", 1, ".", "alpn=h2"), -- 2.39.5 From 5311207736ad6b8df61c42352150f19c49d77b5b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 24 Jan 2025 00:17:25 +0000 Subject: [PATCH 08/16] Only include host records in primary domains This also moves to generating the host records automatically without having to write them all out by hand. --- dnsconfig.js | 12 ++ src/openstreetmap.js | 410 +++++++++---------------------------------- 2 files changed, 96 insertions(+), 326 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 5deb02d..5feacca 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -25,6 +25,16 @@ REVCOMPAT("rfc4183"); var IPV4 = require("src/ipv4.json"); var IPV6 = require("src/ipv6.json"); +var HOST_RECORDS = []; + +for (var name in IPV4) { + HOST_RECORDS.push(A(name, IPV4[name])); +} + +for (var name in IPV6) { + HOST_RECORDS.push(AAAA(name, IPV6[name])); +} + var OPENSTREETMAP = loadTemplate("openstreetmap"); require("include/sshfp.js"); @@ -75,6 +85,7 @@ OPENSTREETMAP("openstreetmap.org.nz", REG_GANDI); D_EXTEND("openstreetmap.org", CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")), + HOST_RECORDS, SSHFP_RECORDS, GEO_NS_RECORDS, NOMINATIM_RECORDS @@ -83,6 +94,7 @@ D_EXTEND("openstreetmap.org", D_EXTEND("osm.org", CNAME("_acme-challenge.tile", "21gvdfyyxjoc4lmsem.fastly-validations.com.", TTL("10m")), + HOST_RECORDS, SSHFP_RECORDS ); diff --git a/src/openstreetmap.js b/src/openstreetmap.js index b8fa1d6..45df0a0 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -213,8 +213,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web servers and their aliases - A("spike-01", IPV4["spike-01.he"]), - AAAA("spike-01", IPV6["spike-01.he"]), + HTTPS("www", 1, ".", "alpn=h2"), + HTTPS("api", 1, ".", "alpn=h2"), + HTTPS("maps", 1, ".", "alpn=h2"), + HTTPS("mapz", 1, ".", "alpn=h2"), + // A("@", IPV4["spike-01.he"]), // AAAA("@", IPV6["spike-01.he"]), // A("www", IPV4["spike-01.he"]), @@ -225,11 +228,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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"]), @@ -240,11 +239,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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"]), @@ -255,11 +250,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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), @@ -270,11 +261,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -285,11 +272,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -300,74 +283,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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"), - HTTPS("api", 1, ".", "alpn=h2"), - HTTPS("maps", 1, ".", "alpn=h2"), - HTTPS("mapz", 1, ".", "alpn=h2"), // Nominatim servers - A("dulcy", IPV4["dulcy"]), - AAAA("dulcy", IPV6["dulcy"]), - A("dulcy.ams", IPV4["dulcy.ams"]), - A("dulcy.oob", IPV4["dulcy.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", IPV4["stormfly-04"]), - AAAA("stormfly-04", IPV6["stormfly-04"]), - A("stormfly-04.oob", IPV4["stormfly-04.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."), CNAME("qa-tile.nominatim", "longma.openstreetmap.org."), // Tile servers - A("odin", IPV4["odin"]), - AAAA("odin", IPV6["odin"]), - A("odin.ams", IPV4["odin.ams"]), - A("odin.oob", IPV4["odin.oob"]), - - A("ysera", IPV4["ysera"]), - A("ysera.ucl", IPV4["ysera.ucl"]), - A("ysera.oob", IPV4["ysera.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", IPV4["nidhogg"]), - AAAA("nidhogg", IPV6["nidhogg"]), - A("nidhogg.oob", IPV4["nidhogg.oob"]), - - A("wawel", IPV4["wawel"]), - - A("rhaegal", IPV4["rhaegal"]), - AAAA("rhaegal", IPV6["rhaegal"]), - - A("palulukon", IPV4["palulukon"]), - - A("piasa", IPV4["piasa"]), - AAAA("piasa", IPV6["piasa"]), - A("piasa.oob", IPV4["piasa.oob"]), - - 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."), @@ -380,66 +304,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Vector tile servers - A("cmok", IPV4["cmok"]), - - 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", IPV4["fafnir.he"]), - AAAA("fafnir", IPV6["fafnir.he"]), - A("fafnir.dub", IPV4["fafnir.dub"]), - A("fafnir.oob", IPV4["fafnir.oob"]), - // Planet servers - A("norbert", IPV4["norbert"]), - AAAA("norbert", IPV6["norbert"]), + HTTPS("planet", 1, ".", "alpn=h2"), + 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", 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", IPV4["snap-01.ams"]), - A("snap-01.oob", IPV4["snap-01.oob"]), - - A("snap-02.ucl", IPV4["snap-02.ucl"]), - A("snap-02.oob", IPV4["snap-02.oob"]), - - A("snap-03.dub", IPV4["snap-03.dub"]), - A("snap-03.oob", IPV4["snap-03.oob"]), - - A("karm.ams", IPV4["karm.ams"]), - A("karm.oob", IPV4["karm.oob"]), - - A("eddie.ucl", IPV4["eddie.ucl"]), - A("eddie.oob", IPV4["eddie.oob"]), // Development server with wildcard alias for user sites - A("faffy", IPV4["faffy"]), - AAAA("faffy", IPV6["faffy"]), A("dev", IPV4["faffy"]), AAAA("dev", IPV6["faffy"]), A("*.dev", IPV4["faffy"]), @@ -454,38 +336,32 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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", 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"), HTTPS("foundation", 1, ".", "alpn=h2"), + A("blog", IPV4["ridley"]), + A("foundation", IPV4["ridley"]), + // Matomo server - A("smaug", IPV4["smaug.he"]), - AAAA("smaug", IPV6["smaug.he"]), + 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"]), - A("smaug.dub", IPV4["smaug.dub"]), - A("smaug.oob", IPV4["smaug.oob"]), - - // HTTPS / SVCB records - HTTPS("matomo", 1, ".", "alpn=h2"), - HTTPS("piwik", 1, ".", "alpn=h2"), // Imagery servers + 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"]), @@ -495,11 +371,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("c.agri", IPV4["lockheed"]), AAAA("c.agri", IPV6["lockheed"]), - // HTTPS / SVCB records - HTTPS("agri", 1, ".", "alpn=h2"), - HTTPS("a.agri", 1, ".", "alpn=h2"), - HTTPS("b.agri", 1, ".", "alpn=h2"), - HTTPS("c.agri", 1, ".", "alpn=h2"), + 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"]), @@ -510,31 +385,41 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("c.os", IPV4["lockheed"]), AAAA("c.os", IPV6["lockheed"]), - // HTTPS / SVCB records - HTTPS("os", 1, ".", "alpn=h2"), - HTTPS("a.os", 1, ".", "alpn=h2"), - HTTPS("b.os", 1, ".", "alpn=h2"), - HTTPS("c.os", 1, ".", "alpn=h2"), + 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("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"]), // Prometheus server and munin redirect - A("stormfly-03", IPV4["stormfly-03"]), - AAAA("stormfly-03", IPV6["stormfly-03"]), + 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"]), - A("stormfly-03.oob", IPV4["stormfly-03.oob"]), - - // HTTPS / SVCB records - HTTPS("prometheus", 1, ".", "alpn=h2"), - HTTPS("munin", 1, ".", "alpn=h2"), // Management server - A("idris", IPV4["idris.he"]), - AAAA("idris", IPV6["idris.he"]), + 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"), + A("acme", IPV4["idris.he"]), AAAA("acme", IPV6["idris.he"]), A("apt", IPV4["idris.he"]), @@ -547,75 +432,30 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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"), - HTTPS("chef", 1, ".", "alpn=h2"), - HTTPS("dns", 1, ".", "alpn=h2"), - HTTPS("git", 1, ".", "alpn=h2"), - HTTPS("hardware", 1, ".", "alpn=h2"), - - // Managed network switches - - A("switch1.ams", IPV4["switch1.ams"]), - AAAA("switch1.ams", IPV6["switch1.ams"]), - - A("switch1.dub", IPV4["switch1.he.dub"]), - AAAA("switch1.dub", IPV6["switch1.he.dub"]), - - // Managed power strips - - A("pdu1.ams", IPV4["pdu1.ams"]), - A("pdu2.ams", IPV4["pdu2.ams"]), - - A("pdu1.dub", IPV4["pdu1.dub"]), - A("pdu2.dub", IPV4["pdu2.dub"]), - - // Out of band access servers - - A("oob1.ams", IPV4["oob1.ams"]), - - A("oob1.dub", IPV4["oob1.dub"]), - - // Network gateways - - 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", IPV4["shenron"]), - AAAA("shenron", IPV6["shenron"]), + HTTPS("lists", 1, ".", "alpn=h2"), + HTTPS("help", 1, ".", "alpn=h2"), + A("lists", IPV4["shenron"]), AAAA("lists", IPV6["shenron"]), A("help", IPV4["shenron"]), AAAA("help", IPV6["shenron"]), - // HTTPS / SVCB records - HTTPS("lists", 1, ".", "alpn=h2"), - HTTPS("help", 1, ".", "alpn=h2"), + // Naga services - // Naga service + HTTPS("svn", 1, ".", "alpn=h2"), + HTTPS("trac", 1, ".", "alpn=h2"), + HTTPS("irc", 1, ".", "alpn=h2"), + HTTPS("blogs", 1, ".", "alpn=h2"), + HTTPS("welcome", 1, ".", "alpn=h2"), + HTTPS("operations", 1, ".", "alpn=h2"), + HTTPS("hot", 1, ".", "alpn=h2"), + HTTPS("dmca", 1, ".", "alpn=h2"), + // HTTPS("otrs", 1, ".", "alpn=h2"), - OTRS is not available using HTTPS/2 + HTTPS("birthday20", 1, ".", "alpn=h2"), - 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"]), @@ -637,49 +477,30 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("birthday20", IPV4["naga.he"]), AAAA("birthday20", IPV6["naga.he"]), - // HTTPS / SVCB records - HTTPS("svn", 1, ".", "alpn=h2"), - HTTPS("trac", 1, ".", "alpn=h2"), - HTTPS("irc", 1, ".", "alpn=h2"), - HTTPS("blogs", 1, ".", "alpn=h2"), - HTTPS("welcome", 1, ".", "alpn=h2"), - HTTPS("operations", 1, ".", "alpn=h2"), - HTTPS("hot", 1, ".", "alpn=h2"), - HTTPS("dmca", 1, ".", "alpn=h2"), - // HTTPS("otrs", 1, ".", "alpn=h2"), - OTRS is not available using HTTPS/2 - HTTPS("birthday20", 1, ".", "alpn=h2"), - - A("naga.dub", IPV4["naga.dub"]), - A("naga.oob", IPV4["naga.oob"]), - // Wiki servers - A("konqi", IPV4["konqi.he"]), - AAAA("konqi", IPV6["konqi.he"]), + HTTPS("wiki", 1, ".", "alpn=h2"), + 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", IPV4["grisu.he"]), - AAAA("grisu", IPV6["grisu.he"]), + HTTPS("query", 1, ".", "alpn=h2"), + 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", IPV4["muirdris.he"]), - AAAA("muirdris", IPV6["muirdris.he"]), + HTTPS("gps-tile", 1, ".", "alpn=h2"), + HTTPS("a.gps-tile", 1, ".", "alpn=h2"), + HTTPS("b.gps-tile", 1, ".", "alpn=h2"), + HTTPS("c.gps-tile", 1, ".", "alpn=h2"), + HTTPS("gps-a.tile", 1, ".", "alpn=h2"), + HTTPS("gps-b.tile", 1, ".", "alpn=h2"), + HTTPS("gps-c.tile", 1, ".", "alpn=h2"), + A("gps-tile", IPV4["muirdris.he"]), AAAA("gps-tile", IPV6["muirdris.he"]), A("a.gps-tile", IPV4["muirdris.he"]), @@ -696,69 +517,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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"), - HTTPS("a.gps-tile", 1, ".", "alpn=h2"), - HTTPS("b.gps-tile", 1, ".", "alpn=h2"), - HTTPS("c.gps-tile", 1, ".", "alpn=h2"), - HTTPS("gps-a.tile", 1, ".", "alpn=h2"), - HTTPS("gps-b.tile", 1, ".", "alpn=h2"), - HTTPS("gps-c.tile", 1, ".", "alpn=h2"), - - // Tile cache servers - - 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", 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", 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"), - 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", IPV4["fume.he"]), - AAAA("fume", IPV6["fume.he"]), - A("fume.dub", IPV4["fume.dub"]), - A("fume.oob", IPV4["fume.oob"]), + 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"]), @@ -767,41 +541,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("communities", IPV6["fume.he"]), AAAA("c", IPV6["fume.he"]), - // HTTPS / SVCB records - HTTPS("community", 1, ".", "alpn=h2"), - HTTPS("communities", 1, ".", "alpn=h2"), - HTTPS("c", 1, ".", "alpn=h2"), - CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"), + HTTPS("forum", 1, ".", "alpn=h2"), + 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", IPV4["tabaluga"]), - AAAA("tabaluga", IPV6["tabaluga"]), - A("tabaluga.ams", IPV4["tabaluga.ams"]), - A("tabaluga.oob", IPV4["tabaluga.oob"]), - - A("staging.blog", IPV4["tabaluga"]), - AAAA("staging.blog", IPV6["tabaluga"]), - - // HTTPS / SVCB records - HTTPS("staging.blog", 1, ".", "alpn=h2"), + HTTPS("taginfo", 1, ".", "alpn=h2"), A("taginfo", IPV4["tabaluga"]), AAAA("taginfo", IPV6["tabaluga"]), - // HTTPS / SVCB records - HTTPS("taginfo", 1, ".", "alpn=h2"), - - // Spare servers + HTTPS("staging.blog", 1, ".", "alpn=h2"), + A("staging.blog", IPV4["tabaluga"]), + AAAA("staging.blog", IPV6["tabaluga"]), // Uptime site at StatusCake -- 2.39.5 From 5313824eeb3ee00b0ac1e360c8bf057dd0f74b46 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 25 Jan 2025 22:17:08 +0000 Subject: [PATCH 09/16] Update dnscontrol link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95cbcb8..7081017 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This repository contains the DNS zone templates and related code for managing Op ## Standard DNS Zone Files -We use [dnscontrol](https://stackexchange.github.io/dnscontrol/) to manage OpenStreetMap DNS. A set of wrapper scripts are used, which are called from the [Makefile](Makefile) +We use [dnscontrol](https://dnscontrol.org/) to manage OpenStreetMap DNS. A set of wrapper scripts are used, which are called from the [Makefile](Makefile) Merges to the master branch trigger a git [post-receive](https://github.com/openstreetmap/chef/blob/master/cookbooks/dns/files/default/post-receive) which runs `make update` via a [script](https://github.com/openstreetmap/chef/blob/master/cookbooks/dns/templates/default/dns-update.erb), the DNS is then updated by dnscontrol. -- 2.39.5 From e08287e202a14e573f7f0802d70707affb5a9ae2 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 25 Jan 2025 22:17:45 +0000 Subject: [PATCH 10/16] Only add update on openstreetmap.org zone --- dnsconfig.js | 3 +++ src/openstreetmap.js | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 5feacca..a96715e 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -85,6 +85,9 @@ OPENSTREETMAP("openstreetmap.org.nz", REG_GANDI); D_EXTEND("openstreetmap.org", CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")), + // Uptime site at StatusCake + CNAME("uptime", "uptimessl-new.statuscake.com."), + HOST_RECORDS, SSHFP_RECORDS, GEO_NS_RECORDS, diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 45df0a0..3f7e433 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -559,10 +559,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), HTTPS("staging.blog", 1, ".", "alpn=h2"), A("staging.blog", IPV4["tabaluga"]), - AAAA("staging.blog", IPV6["tabaluga"]), - - // Uptime site at StatusCake - - CNAME("uptime", "uptimessl-new.statuscake.com.") + AAAA("staging.blog", IPV6["tabaluga"]) ); -- 2.39.5 From dce05ef94a072e144695d6550bae30e88f9c8019 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 25 Jan 2025 22:32:43 +0000 Subject: [PATCH 11/16] Minor order tweak --- src/ptr_equinix_ams_ipv6.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ptr_equinix_ams_ipv6.js b/src/ptr_equinix_ams_ipv6.js index f20a51b..f5c7659 100644 --- a/src/ptr_equinix_ams_ipv6.js +++ b/src/ptr_equinix_ams_ipv6.js @@ -8,7 +8,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV6["spike-06"], "spike-06.openstreetmap.org."), PTR(IPV6["spike-07"], "spike-07.openstreetmap.org."), PTR(IPV6["spike-08"], "spike-08.openstreetmap.org."), - PTR(IPV6["vhagar"], "vhagar.openstreetmap.org."), PTR(IPV6["tabaluga"], "tabaluga.openstreetmap.org."), + PTR(IPV6["vhagar"], "vhagar.openstreetmap.org."), PTR(IPV6["switch1.ams"], "switch1.ams.openstreetmap.org.") ); -- 2.39.5 From 4b40bd0feef87c9b8912d452219e29f788f35cc6 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 1 Feb 2025 21:10:45 +0000 Subject: [PATCH 12/16] Add act-imagery --- src/openstreetmap.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 3f7e433..304e2fb 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -371,6 +371,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("c.agri", IPV4["lockheed"]), AAAA("c.agri", IPV6["lockheed"]), + HTTPS("act-imagery", 1, ".", "alpn=h2"), + HTTPS("a.act-imagery", 1, ".", "alpn=h2"), + HTTPS("b.act-imagery", 1, ".", "alpn=h2"), + HTTPS("c.act-imagery", 1, ".", "alpn=h2"), + + A("act-imagery", IPV4["lockheed"]), + AAAA("act-imagery", IPV6["lockheed"]), + A("a.act-imagery", IPV4["lockheed"]), + AAAA("a.act-imagery", IPV6["lockheed"]), + A("b.act-imagery", IPV4["lockheed"]), + AAAA("b.act-imagery", IPV6["lockheed"]), + A("c.act-imagery", IPV4["lockheed"]), + AAAA("c.act-imagery", IPV6["lockheed"]), + HTTPS("os", 1, ".", "alpn=h2"), HTTPS("a.os", 1, ".", "alpn=h2"), HTTPS("b.os", 1, ".", "alpn=h2"), -- 2.39.5 From d5942ecfbe2621bc2f98eda63a0eabdb74a4c6fc Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 3 Feb 2025 01:48:19 +0000 Subject: [PATCH 13/16] Add au-vic-melbourne-imagery --- src/openstreetmap.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 304e2fb..26a2b61 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -385,6 +385,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("c.act-imagery", IPV4["lockheed"]), AAAA("c.act-imagery", IPV6["lockheed"]), + HTTPS("au-vic-melbourne-imagery", 1, ".", "alpn=h2"), + HTTPS("a.au-vic-melbourne-imagery", 1, ".", "alpn=h2"), + HTTPS("b.au-vic-melbourne-imagery", 1, ".", "alpn=h2"), + HTTPS("c.au-vic-melbourne-imagery", 1, ".", "alpn=h2"), + + A("au-vic-melbourne-imagery", IPV4["lockheed"]), + AAAA("au-vic-melbourne-imagery", IPV6["lockheed"]), + A("a.au-vic-melbourne-imagery", IPV4["lockheed"]), + AAAA("a.au-vic-melbourne-imagery", IPV6["lockheed"]), + A("b.au-vic-melbourne-imagery", IPV4["lockheed"]), + AAAA("b.au-vic-melbourne-imagery", IPV6["lockheed"]), + A("c.au-vic-melbourne-imagery", IPV4["lockheed"]), + AAAA("c.au-vic-melbourne-imagery", IPV6["lockheed"]), + HTTPS("os", 1, ".", "alpn=h2"), HTTPS("a.os", 1, ".", "alpn=h2"), HTTPS("b.os", 1, ".", "alpn=h2"), -- 2.39.5 From b9fb9896acc2590b6a34886a68fc21dde8df3057 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 10 Feb 2025 11:20:28 +0000 Subject: [PATCH 14/16] Make reverse DNS for he.net addresses point at the HE name variants --- src/ptr_he_dub_ipv4.js | 30 +++++++++++++++--------------- src/ptr_he_dub_ipv6.js | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/ptr_he_dub_ipv4.js b/src/ptr_he_dub_ipv4.js index 9ee2839..bc24c37 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(IPV4["culebre.he"], "culebre.openstreetmap.org."), - PTR(IPV4["fafnir.he"], "fafnir.openstreetmap.org."), - PTR(IPV4["fume.he"], "fume.openstreetmap.org."), - PTR(IPV4["grisu.he"], "grisu.openstreetmap.org."), - PTR(IPV4["horntail.he"], "horntail.openstreetmap.org."), - PTR(IPV4["idris.he"], "idris.openstreetmap.org."), - PTR(IPV4["konqi.he"], "konqi.openstreetmap.org."), - PTR(IPV4["longma.he"], "longma.openstreetmap.org."), - PTR(IPV4["muirdris.he"], "muirdris.openstreetmap.org."), - PTR(IPV4["naga.he"], "naga.openstreetmap.org."), - PTR(IPV4["smaug.he"], "smaug.openstreetmap.org."), - PTR(IPV4["spike-01.he"], "spike-01.openstreetmap.org."), - PTR(IPV4["spike-02.he"], "spike-02.openstreetmap.org."), - PTR(IPV4["spike-03.he"], "spike-03.openstreetmap.org."), - PTR(IPV4["switch1.he.dub"], "switch1.dub.openstreetmap.org.") + PTR(IPV4["culebre.he"], "culebre.he.openstreetmap.org."), + PTR(IPV4["fafnir.he"], "fafnir.he.openstreetmap.org."), + PTR(IPV4["fume.he"], "fume.he.openstreetmap.org."), + PTR(IPV4["grisu.he"], "grisu.he.openstreetmap.org."), + PTR(IPV4["horntail.he"], "horntail.he.openstreetmap.org."), + PTR(IPV4["idris.he"], "idris.he.openstreetmap.org."), + PTR(IPV4["konqi.he"], "konqi.he.openstreetmap.org."), + PTR(IPV4["longma.he"], "longma.he.openstreetmap.org."), + PTR(IPV4["muirdris.he"], "muirdris.he.openstreetmap.org."), + PTR(IPV4["naga.he"], "naga.he.openstreetmap.org."), + PTR(IPV4["smaug.he"], "smaug.he.openstreetmap.org."), + PTR(IPV4["spike-01.he"], "spike-01.he.openstreetmap.org."), + PTR(IPV4["spike-02.he"], "spike-02.he.openstreetmap.org."), + PTR(IPV4["spike-03.he"], "spike-03.he.openstreetmap.org."), + PTR(IPV4["switch1.he.dub"], "switch1.he.dub.openstreetmap.org.") ); diff --git a/src/ptr_he_dub_ipv6.js b/src/ptr_he_dub_ipv6.js index 95ae717..7ed465c 100644 --- a/src/ptr_he_dub_ipv6.js +++ b/src/ptr_he_dub_ipv6.js @@ -1,17 +1,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), - PTR(IPV6["culebre.he"], "culebre.openstreetmap.org."), - PTR(IPV6["fafnir.he"], "fafnir.openstreetmap.org."), - PTR(IPV6["fume.he"], "fume.openstreetmap.org."), - PTR(IPV6["grisu.he"], "grisu.openstreetmap.org."), - PTR(IPV6["horntail.he"], "horntail.openstreetmap.org."), - PTR(IPV6["idris.he"], "idris.openstreetmap.org."), - PTR(IPV6["konqi.he"], "konqi.openstreetmap.org."), - PTR(IPV6["longma.he"], "longma.openstreetmap.org."), - PTR(IPV6["muirdris.he"], "muirdris.openstreetmap.org."), - PTR(IPV6["naga.he"], "naga.openstreetmap.org."), - PTR(IPV6["smaug.he"], "smaug.openstreetmap.org."), - PTR(IPV6["spike-01.he"], "spike-01.openstreetmap.org."), - PTR(IPV6["spike-02.he"], "spike-02.openstreetmap.org."), - PTR(IPV6["spike-03.he"], "spike-03.openstreetmap.org."), - PTR(IPV6["switch1.he.dub"], "switch1.dub.openstreetmap.org.") + PTR(IPV6["culebre.he"], "culebre.he.openstreetmap.org."), + PTR(IPV6["fafnir.he"], "fafnir.he.openstreetmap.org."), + PTR(IPV6["fume.he"], "fume.he.openstreetmap.org."), + PTR(IPV6["grisu.he"], "grisu.he.openstreetmap.org."), + PTR(IPV6["horntail.he"], "horntail.he.openstreetmap.org."), + PTR(IPV6["idris.he"], "idris.he.openstreetmap.org."), + PTR(IPV6["konqi.he"], "konqi.he.openstreetmap.org."), + PTR(IPV6["longma.he"], "longma.he.openstreetmap.org."), + PTR(IPV6["muirdris.he"], "muirdris.he.openstreetmap.org."), + PTR(IPV6["naga.he"], "naga.he.openstreetmap.org."), + PTR(IPV6["smaug.he"], "smaug.he.openstreetmap.org."), + PTR(IPV6["spike-01.he"], "spike-01.he.openstreetmap.org."), + PTR(IPV6["spike-02.he"], "spike-02.he.openstreetmap.org."), + PTR(IPV6["spike-03.he"], "spike-03.he.openstreetmap.org."), + PTR(IPV6["switch1.he.dub"], "switch1.he.dub.openstreetmap.org.") ); -- 2.39.5 From 4c247e48f85f324940222f65439c91ea87e93887 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 10 Feb 2025 23:25:08 +0000 Subject: [PATCH 15/16] Add PTR records for HE AMS --- dnsconfig.js | 8 ++++++++ src/ipv4.json | 12 ++++++++++++ src/ipv6.json | 14 +++++++++++++- src/ptr_equinix_ams_ipv4.js | 1 - src/ptr_equinix_dub_ipv4.js | 1 - src/ptr_he_ams_ipv4.js | 14 ++++++++++++++ src/ptr_he_ams_ipv6.js | 14 ++++++++++++++ 7 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 src/ptr_he_ams_ipv4.js create mode 100644 src/ptr_he_ams_ipv6.js diff --git a/dnsconfig.js b/dnsconfig.js index a96715e..b3f5efb 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -165,6 +165,14 @@ IDEDITOR("ideditor.com", REG_GANDI); var OSMWIKI = loadTemplate("osm-wiki"); OSMWIKI("osm.wiki", REG_GANDI); +var PTR_HE_AMS_IPV4 = loadTemplate("ptr_he_ams_ipv4"); + +PTR_HE_AMS_IPV4(REV("184.104.179.128/27"), REG_NONE); + +var PTR_HE_AMS_IPV6 = loadTemplate("ptr_he_ams_ipv6"); + +PTR_HE_AMS_IPV6(REV("2001:470:1:fa1::/64"), REG_NONE); + var PTR_HE_DUB_IPV4 = loadTemplate("ptr_he_dub_ipv4"); PTR_HE_DUB_IPV4(REV("184.104.226.96/27"), REG_NONE); diff --git a/src/ipv4.json b/src/ipv4.json index 0b805bd..33ce969 100644 --- a/src/ipv4.json +++ b/src/ipv4.json @@ -7,9 +7,11 @@ "culebre.dub": "10.0.64.9", "culebre.oob": "10.0.65.9" "dribble": "82.199.86.100", + "dribble.he": "184.104.179.132", "dribble.ams": "10.0.48.4", "dribble.oob": "10.0.49.4" "dulcy": "82.199.86.105", + "dulcy.he": "184.104.179.137", "dulcy.ams": "10.0.48.9", "dulcy.oob": "10.0.49.9" "eddie.ucl": "10.0.0.10", @@ -23,6 +25,7 @@ "equinix-gw-2.dub": "87.252.218.107", "equinix-osm.dub": "87.252.218.108", "faffy": "82.199.86.99", + "faffy.he": "184.104.179.131", "faffy.ams": "10.0.48.3", "faffy.oob": "10.0.49.3" "fafnir": "87.252.214.98", @@ -53,6 +56,7 @@ "konqi.oob": "10.0.65.7" "ladon": "83.212.2.116", "lockheed": "82.199.86.112", + "lockheed.he": "184.104.179.144", "lockheed.ams": "10.0.48.16", "lockheed.oob": "10.0.49.16" "longma": "87.252.214.109", @@ -72,9 +76,11 @@ "nidhogg": "194.71.11.111", "nidhogg.oob": "130.239.18.115" "norbert": "82.199.86.113", + "norbert.he": "184.104.179.145", "norbert.ams": "10.0.48.17", "norbert.oob": "10.0.49.17" "odin": "82.199.86.111", + "odin.he": "184.104.179.143", "odin.ams": "10.0.48.15", "odin.oob": "10.0.49.15" "oob1.ams": "10.0.48.102" @@ -116,12 +122,15 @@ "spike-03.dub": "10.0.64.5", "spike-03.oob": "10.0.65.5", "spike-06": "82.199.86.102", + "spike-06.he": "184.104.179.134", "spike-06.ams": "10.0.48.6", "spike-06.oob": "10.0.49.6" "spike-07": "82.199.86.103", + "spike-07.he": "184.104.179.135", "spike-07.ams": "10.0.48.7", "spike-07.oob": "10.0.49.7" "spike-08": "82.199.86.104", + "spike-08.he": "184.104.179.136", "spike-08.ams": "10.0.48.8", "spike-08.oob": "10.0.49.8" "stormfly-03": "140.211.167.99", @@ -129,12 +138,15 @@ "stormfly-04": "140.211.167.100", "stormfly-04.oob": "10.0.0.3" "switch1.ams": "82.199.86.97", + "switch1.he.ams": "184.104.179.129", "switch1.dub": "87.252.214.97", "switch1.he.dub": "184.104.226.97", "tabaluga": "82.199.86.110", + "tabaluga.he": "184.104.179.142", "tabaluga.ams": "10.0.48.14", "tabaluga.oob": "10.0.49.14" "vhagar": "82.199.86.101", + "vhagar.he": "184.104.179.133", "vhagar.ams": "10.0.48.5", "vhagar.oob": "10.0.49.5", "wawel": "64.225.136.96" diff --git a/src/ipv6.json b/src/ipv6.json index 6e0b81b..dfe79f8 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -4,7 +4,9 @@ "culebre": "2001:4d78:fe03:1c::9", "culebre.he": "2001:470:1:b3b::9", "dribble": "2001:4d78:500:5e3::4", + "dribble.he": "2001:470:1:fa1::4", "dulcy": "2001:4d78:500:5e3::9", + "dulcy.he": "2001:470:1:fa1::9", "equinix-gw.ams": "2001:4d78:500:5e2::1" "equinix-gw-1.ams": "2001:4d78:500:5e2::2" "equinix-gw-2.ams": "2001:4d78:500:5e2::3", @@ -14,6 +16,7 @@ "equinix-gw-2.dub": "2001:4d78:fe03:1b::3" "equinix-osm.dub": "2001:4d78:fe03:1b::4" "faffy": "2001:4d78:500:5e3::3", + "faffy.he": "2001:470:1:fa1::3", "fafnir": "2001:4d78:fe03:1c::2", "fafnir.he": "2001:470:1:b3b::2", "fume": "2001:4d78:fe03:1c::10", @@ -28,6 +31,7 @@ "konqi.he": "2001:470:1:b3b::7", "ladon": "2001:648:2ffe:4::116" "lockheed": "2001:4d78:500:5e3::10", + "lockheed.he": "2001:470:1:fa1::10", "longma": "2001:4d78:fe03:1c::d", "longma.he": "2001:470:1:b3b::d", "meraxes": "2001:bc8:2d57:100:aa1e:84ff:fe72:e660" @@ -37,7 +41,9 @@ "naga.he": "2001:470:1:b3b::8", "nidhogg": "2001:6b0:19:2::111", "norbert": "2001:4d78:500:5e3::11", + "norbert.he": "2001:470:1:fa1::11", "odin": "2001:4d78:500:5e3::f", + "odin.he": "2001:470:1:fa1::f", "piasa": "2605:bc80:3010:700::8cd3:a765", "rhaegal": "2001:b68:40ff:3::2" "shenron": "2001:41c9:1:400::32" @@ -50,13 +56,19 @@ "spike-03": "2001:4d78:fe03:1c::5", "spike-03.he": "2001:470:1:b3b::5", "spike-06": "2001:4d78:500:5e3::6", + "spike-06.he": "2001:470:1:fa1::6", "spike-07": "2001:4d78:500:5e3::7", + "spike-07.he": "2001:470:1:fa1::7", "spike-08": "2001:4d78:500:5e3::8", + "spike-08.he": "2001:470:1:fa1::8", "stormfly-03": "2605:bc80:3010:700::8cd3:a763", "stormfly-04": "2605:bc80:3010:700::8cd3:a764", + "switch1.he.ams": "2001:470:1:fa1::1" "switch1.ams": "2001:4d78:500:5e3::1" "switch1.dub": "2001:4d78:fe03:1c::1", "switch1.he.dub": "2001:470:1:b3b::1" "tabaluga": "2001:4d78:500:5e3::e", - "vhagar": "2001:4d78:500:5e3::5" + "tabaluga.he": "2001:470:1:fa1::e", + "vhagar": "2001:4d78:500:5e3::5", + "vhagar.he": "2001:470:1:fa1::5" } diff --git a/src/ptr_equinix_ams_ipv4.js b/src/ptr_equinix_ams_ipv4.js index b8afdd7..dd6cc43 100644 --- a/src/ptr_equinix_ams_ipv4.js +++ b/src/ptr_equinix_ams_ipv4.js @@ -1,4 +1,3 @@ -// http://www.he.net/adm/reverse.dns.html (RFC4183 notation) D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV4["dribble"], "dribble.openstreetmap.org."), PTR(IPV4["dulcy"], "dulcy.openstreetmap.org."), diff --git a/src/ptr_equinix_dub_ipv4.js b/src/ptr_equinix_dub_ipv4.js index f341ead..f726d07 100644 --- a/src/ptr_equinix_dub_ipv4.js +++ b/src/ptr_equinix_dub_ipv4.js @@ -1,4 +1,3 @@ -// http://www.he.net/adm/reverse.dns.html (RFC4183 notation) D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV4["culebre"], "culebre.openstreetmap.org."), PTR(IPV4["fafnir"], "fafnir.openstreetmap.org."), diff --git a/src/ptr_he_ams_ipv4.js b/src/ptr_he_ams_ipv4.js new file mode 100644 index 0000000..a6d42c0 --- /dev/null +++ b/src/ptr_he_ams_ipv4.js @@ -0,0 +1,14 @@ +D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), + PTR(IPV4["dribble.he"], "dribble.he.openstreetmap.org."), + PTR(IPV4["dulcy.he"], "dulcy.he.openstreetmap.org."), + PTR(IPV4["faffy.he"], "faffy.he.openstreetmap.org."), + PTR(IPV4["lockheed.he"], "lockheed.he.openstreetmap.org."), + PTR(IPV4["norbert.he"], "norbert.he.openstreetmap.org."), + PTR(IPV4["odin.he"], "odin.he.openstreetmap.org."), + PTR(IPV4["spike-06.he"], "spike-06.he.openstreetmap.org."), + PTR(IPV4["spike-07.he"], "spike-07.he.openstreetmap.org."), + PTR(IPV4["spike-08.he"], "spike-08.he.openstreetmap.org."), + PTR(IPV4["tabaluga.he"], "tabaluga.he.openstreetmap.org."), + PTR(IPV4["vhagar.he"], "vhagar.he.openstreetmap.org."), + PTR(IPV4["switch1.he.ams"], "switch1.he.ams.openstreetmap.org.") +); diff --git a/src/ptr_he_ams_ipv6.js b/src/ptr_he_ams_ipv6.js new file mode 100644 index 0000000..e8e1b3c --- /dev/null +++ b/src/ptr_he_ams_ipv6.js @@ -0,0 +1,14 @@ +D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), + PTR(IPV6["dribble.he"], "dribble.he.openstreetmap.org."), + PTR(IPV6["dulcy.he"], "dulcy.he.openstreetmap.org."), + PTR(IPV6["faffy.he"], "faffy.he.openstreetmap.org."), + PTR(IPV6["lockheed.he"], "lockheed.he.openstreetmap.org."), + PTR(IPV6["norbert.he"], "norbert.he.openstreetmap.org."), + PTR(IPV6["odin.he"], "odin.he.openstreetmap.org."), + PTR(IPV6["spike-06.he"], "spike-06.he.openstreetmap.org."), + PTR(IPV6["spike-07.he"], "spike-07.he.openstreetmap.org."), + PTR(IPV6["spike-08.he"], "spike-08.he.openstreetmap.org."), + PTR(IPV6["tabaluga.he"], "tabaluga.he.openstreetmap.org."), + PTR(IPV6["vhagar.he"], "vhagar.he.openstreetmap.org."), + PTR(IPV6["switch1.he.ams"], "switch1.he.ams.openstreetmap.org.") +); -- 2.39.5 From 3ea4c0baca1e065b907bacecbf59041b6caa24a3 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 16 Feb 2025 10:09:04 +0100 Subject: [PATCH 16/16] Fix SPF for osmfoundation (otrs). Remove record duplication --- src/openstreetmap.js | 75 +++----------------------------------------- src/osmfoundation.js | 16 ++-------- 2 files changed, 7 insertions(+), 84 deletions(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 26a2b61..bae9c42 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -60,20 +60,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "messages", parts: [ "v=spf1", - "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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), @@ -82,20 +69,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "noreply", parts: [ "v=spf1", - "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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), @@ -104,20 +78,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "otrs", parts: [ "v=spf1", - "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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), @@ -126,20 +87,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "community", parts: [ "v=spf1", - "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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), @@ -148,20 +96,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "supporting", parts: [ "v=spf1", - "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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), diff --git a/src/osmfoundation.js b/src/osmfoundation.js index cbb22d2..642e584 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -31,13 +31,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "v=spf1", "include:mailbox.org", // mailbox.org "include:_spf.google.com", // Google GSuite - "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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), @@ -46,13 +40,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "wiki", 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 + "include:openstreetmap.org", // main openstreetmap.org spf record "-all" ] }), -- 2.39.5