X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/fb942b32058d087a689660c6d64f84d79052f369..efdc7aa9f4b790b3d5e4390d5607b3d7179b88a4:/src/openstreetmap.js?ds=sidebyside diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 2558b69..1bf2cfb 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -44,7 +44,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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:/64", // 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) @@ -66,7 +66,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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:/64", // 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) @@ -88,7 +88,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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:/64", // 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) @@ -110,7 +110,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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:/64", // 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) @@ -132,7 +132,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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:/64", // 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) @@ -154,7 +154,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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:/64", // 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) @@ -215,91 +215,91 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("spike-01", SPIKE01_IPV4), AAAA("spike-01", SPIKE01_IPV6), - A("@", SPIKE01_IPV4), - AAAA("@", SPIKE01_IPV6), - A("www", SPIKE01_IPV4), - AAAA("www", SPIKE01_IPV6), - A("api", SPIKE01_IPV4), - AAAA("api", SPIKE01_IPV6), - A("maps", SPIKE01_IPV4), - AAAA("maps", SPIKE01_IPV6), - A("mapz", SPIKE01_IPV4), - AAAA("mapz", SPIKE01_IPV6), + // A("@", SPIKE01_IPV4), + // AAAA("@", SPIKE01_IPV6), + // A("www", SPIKE01_IPV4), + // AAAA("www", SPIKE01_IPV6), + // A("api", SPIKE01_IPV4), + // AAAA("api", SPIKE01_IPV6), + // A("maps", SPIKE01_IPV4), + // AAAA("maps", SPIKE01_IPV6), + // A("mapz", SPIKE01_IPV4), + // AAAA("mapz", SPIKE01_IPV6), A("spike-01.dub", SPIKE01_INTERNAL), A("spike-01.oob", SPIKE01_OOB), A("spike-02", SPIKE02_IPV4), AAAA("spike-02", SPIKE02_IPV6), - A("@", SPIKE02_IPV4), - AAAA("@", SPIKE02_IPV6), - A("www", SPIKE02_IPV4), - AAAA("www", SPIKE02_IPV6), - A("api", SPIKE02_IPV4), - AAAA("api", SPIKE02_IPV6), - A("maps", SPIKE02_IPV4), - AAAA("maps", SPIKE02_IPV6), - A("mapz", SPIKE02_IPV4), - AAAA("mapz", SPIKE02_IPV6), + // A("@", SPIKE02_IPV4), + // AAAA("@", SPIKE02_IPV6), + // A("www", SPIKE02_IPV4), + // AAAA("www", SPIKE02_IPV6), + // A("api", SPIKE02_IPV4), + // AAAA("api", SPIKE02_IPV6), + // A("maps", SPIKE02_IPV4), + // AAAA("maps", SPIKE02_IPV6), + // A("mapz", SPIKE02_IPV4), + // AAAA("mapz", SPIKE02_IPV6), A("spike-02.dub", SPIKE02_INTERNAL), A("spike-02.oob", SPIKE02_OOB), A("spike-03", SPIKE03_IPV4), AAAA("spike-03", SPIKE03_IPV6), - A("@", SPIKE03_IPV4), - AAAA("@", SPIKE03_IPV6), - A("www", SPIKE03_IPV4), - AAAA("www", SPIKE03_IPV6), - A("api", SPIKE03_IPV4), - AAAA("api", SPIKE03_IPV6), - A("maps", SPIKE03_IPV4), - AAAA("maps", SPIKE03_IPV6), - A("mapz", SPIKE03_IPV4), - AAAA("mapz", SPIKE03_IPV6), + // A("@", SPIKE03_IPV4), + // AAAA("@", SPIKE03_IPV6), + // A("www", SPIKE03_IPV4), + // AAAA("www", SPIKE03_IPV6), + // A("api", SPIKE03_IPV4), + // AAAA("api", SPIKE03_IPV6), + // A("maps", SPIKE03_IPV4), + // AAAA("maps", SPIKE03_IPV6), + // A("mapz", SPIKE03_IPV4), + // AAAA("mapz", SPIKE03_IPV6), A("spike-03.dub", SPIKE03_INTERNAL), A("spike-03.oob", SPIKE03_OOB), A("spike-06", SPIKE06_IPV4), - // AAAA("spike-06", SPIKE06_IPV6), - // A("@", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("@", SPIKE06_IPV6, CF_PROXY_ON), - // A("www", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("www", SPIKE06_IPV6, CF_PROXY_ON), - // A("api", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("api", SPIKE06_IPV6, CF_PROXY_ON), - // A("maps", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("maps", SPIKE06_IPV6, CF_PROXY_ON), - // A("mapz", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("mapz", SPIKE06_IPV6, CF_PROXY_ON), + 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), + 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), + 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), @@ -312,7 +312,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Nominatim servers A("dulcy", DULCY_IPV4), - // AAAA("dulcy", DULCY_IPV6), + AAAA("dulcy", DULCY_IPV6), A("dulcy.ams", DULCY_INTERNAL), A("dulcy.oob", DULCY_OOB), @@ -326,7 +326,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("stormfly-04.oob", STORMFLY04_OOB), A("vhagar", VHAGAR_IPV4), - // AAAA("vhagar", VHAGAR_IPV6), + AAAA("vhagar", VHAGAR_IPV6), A("vhagar.ams", VHAGAR_INTERNAL), A("vhagar.oob", VHAGAR_OOB), @@ -337,7 +337,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Tile servers A("odin", ODIN_IPV4), - // AAAA("odin", ODIN_IPV6), + AAAA("odin", ODIN_IPV6), A("odin.ams", ODIN_INTERNAL), A("odin.oob", ODIN_OOB), @@ -401,11 +401,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Planet servers A("norbert", NORBERT_IPV4), - // AAAA("norbert", NORBERT_IPV6), + AAAA("norbert", NORBERT_IPV6), A("backup", NORBERT_IPV4), - // AAAA("backup", NORBERT_IPV6), + AAAA("backup", NORBERT_IPV6), A("planet", NORBERT_IPV4), - // AAAA("planet", NORBERT_IPV6), + AAAA("planet", NORBERT_IPV6), A("norbert.ams", NORBERT_INTERNAL), A("norbert.oob", NORBERT_OOB), @@ -441,21 +441,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Development server with wildcard alias for user sites A("faffy", FAFFY_IPV4), - // AAAA("faffy", FAFFY_IPV6), + AAAA("faffy", FAFFY_IPV6), A("dev", FAFFY_IPV4), - // AAAA("dev", FAFFY_IPV6), + AAAA("dev", FAFFY_IPV6), A("*.dev", FAFFY_IPV4), - // AAAA("*.dev", FAFFY_IPV6), + AAAA("*.dev", FAFFY_IPV6), A("ooc", FAFFY_IPV4), - // AAAA("ooc", FAFFY_IPV6), + AAAA("ooc", FAFFY_IPV6), A("a.ooc", FAFFY_IPV4), - // AAAA("a.ooc", FAFFY_IPV6), + AAAA("a.ooc", FAFFY_IPV6), A("b.ooc", FAFFY_IPV4), - // AAAA("b.ooc", FAFFY_IPV6), + AAAA("b.ooc", FAFFY_IPV6), A("c.ooc", FAFFY_IPV4), - // AAAA("c.ooc", FAFFY_IPV6), + AAAA("c.ooc", FAFFY_IPV6), A("npe", FAFFY_IPV4), - // AAAA("npe", FAFFY_IPV6), + AAAA("npe", FAFFY_IPV6), A("faffy.ams", FAFFY_INTERNAL), A("faffy.oob", FAFFY_OOB), @@ -489,21 +489,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Imagery servers A("agri", LOCKHEED_IPV4), - // AAAA("agri", LOCKHEED_IPV6), + AAAA("agri", LOCKHEED_IPV6), A("a.agri", LOCKHEED_IPV4), - // AAAA("a.agri", LOCKHEED_IPV6), + AAAA("a.agri", LOCKHEED_IPV6), A("b.agri", LOCKHEED_IPV4), - // AAAA("b.agri", LOCKHEED_IPV6), + AAAA("b.agri", LOCKHEED_IPV6), A("c.agri", LOCKHEED_IPV4), - // AAAA("c.agri", LOCKHEED_IPV6), + AAAA("c.agri", LOCKHEED_IPV6), A("os", LOCKHEED_IPV4), - // AAAA("os", LOCKHEED_IPV6), + AAAA("os", LOCKHEED_IPV6), A("a.os", LOCKHEED_IPV4), - // AAAA("a.os", LOCKHEED_IPV6), + AAAA("a.os", LOCKHEED_IPV6), A("b.os", LOCKHEED_IPV4), - // AAAA("b.os", LOCKHEED_IPV6), + AAAA("b.os", LOCKHEED_IPV6), A("c.os", LOCKHEED_IPV4), - // AAAA("c.os", LOCKHEED_IPV6), + AAAA("c.os", LOCKHEED_IPV6), // Prometheus server and munin redirect @@ -572,6 +572,26 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("oob1.dub", OOB1DUB_INTERNAL), + // 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), + // Bytemark machine, and the services which operate from it A("shenron", SHENRON_IPV4), @@ -757,7 +777,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Taginfo and Staging Blog Server A("tabaluga", TABALUGA_IPV4), - // AAAA("tabaluga", TABALUGA_IPV6), + AAAA("tabaluga", TABALUGA_IPV6), A("tabaluga.ams", TABALUGA_INTERNAL), A("tabaluga.oob", TABALUGA_OOB), @@ -776,7 +796,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Spare servers A("dribble", DRIBBLE_IPV4), - // AAAA("dribble", DRIBBLE_IPV6), + AAAA("dribble", DRIBBLE_IPV6), A("dribble.ams", DRIBBLE_INTERNAL), A("dribble.oob", DRIBBLE_OOB),