From adc6dbdde166130f4e99b7205702fe264a895454 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 17 Dec 2024 17:22:07 +0000 Subject: [PATCH] Add IPv6 addresses for Amsterdam --- src/hosts.js | 24 ++++++------- src/openstreetmap.js | 86 ++++++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/hosts.js b/src/hosts.js index c115354..ef645ce 100644 --- a/src/hosts.js +++ b/src/hosts.js @@ -16,12 +16,12 @@ 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:470:1:fa1::4"; +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:470:1:fa1::9"; +var DULCY_IPV6 = "2001:4d78:500:5e3::9"; var DULCY_INTERNAL = "10.0.48.9"; var DULCY_OOB = "10.0.49.9"; @@ -29,7 +29,7 @@ var EDDIE_INTERNAL = "10.0.0.10"; var EDDIE_OOB = "10.0.1.10"; var FAFFY_IPV4 = "82.199.86.99"; -var FAFFY_IPV6 = "2001:470:1:fa1::3"; +var FAFFY_IPV6 = "2001:4d78:500:5e3::3"; var FAFFY_INTERNAL = "10.0.48.3"; var FAFFY_OOB = "10.0.49.3"; @@ -72,7 +72,7 @@ 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:470:1:fa1::10"; +var LOCKHEED_IPV6 = "2001:4d78:500:5e3::10"; var LOCKHEED_INTERNAL = "10.0.48.16"; var LOCKHEED_OOB = "10.0.49.16"; @@ -101,12 +101,12 @@ 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:470:1:fa1::11"; +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:470:1:fa1::f"; +var ODIN_IPV6 = "2001:4d78:500:5e3::f"; var ODIN_INTERNAL = "10.0.48.15"; var ODIN_OOB = "10.0.49.15"; @@ -174,17 +174,17 @@ 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:470:1:fa1::6"; +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:470:1:fa1::7"; +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:470:1:fa1::8"; +var SPIKE08_IPV6 = "2001:4d78:500:5e3::8"; var SPIKE08_INTERNAL = "10.0.48.8"; var SPIKE08_OOB = "10.0.49.8"; @@ -197,18 +197,18 @@ 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:470:1:fa1::1"; +var SWITCH1AMS_IPV6 = "2001:4d78:500:5e3::1"; var SWITCH1DUB_IPV4 = "184.104.226.97"; var SWITCH1DUB_IPV6 = "2001:470:1:b3b::1"; var TABALUGA_IPV4 = "82.199.86.110"; -var TABALUGA_IPV6 = "2001:470:1:fa1::e"; +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:470:1:fa1::5"; +var VHAGAR_IPV6 = "2001:4d78:500:5e3::5"; var VHAGAR_INTERNAL = "10.0.48.5"; var VHAGAR_OOB = "10.0.49.5"; diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 72321bf..713888b 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -259,47 +259,47 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("spike-03.oob", SPIKE03_OOB), A("spike-06", SPIKE06_IPV4), - // AAAA("spike-06", SPIKE06_IPV6), + AAAA("spike-06", SPIKE06_IPV6), A("@", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("@", SPIKE06_IPV6, CF_PROXY_ON), + AAAA("@", SPIKE06_IPV6, CF_PROXY_ON), A("www", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("www", SPIKE06_IPV6, CF_PROXY_ON), + AAAA("www", SPIKE06_IPV6, CF_PROXY_ON), A("api", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("api", SPIKE06_IPV6, CF_PROXY_ON), + AAAA("api", SPIKE06_IPV6, CF_PROXY_ON), A("maps", SPIKE06_IPV4, CF_PROXY_ON), - // AAAA("maps", SPIKE06_IPV6, 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("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), + AAAA("spike-07", SPIKE07_IPV6), A("@", SPIKE07_IPV4, CF_PROXY_ON), - // AAAA("@", SPIKE07_IPV6, CF_PROXY_ON), + AAAA("@", SPIKE07_IPV6, CF_PROXY_ON), A("www", SPIKE07_IPV4, CF_PROXY_ON), - // AAAA("www", SPIKE07_IPV6, CF_PROXY_ON), + AAAA("www", SPIKE07_IPV6, CF_PROXY_ON), A("api", SPIKE07_IPV4, CF_PROXY_ON), - // AAAA("api", SPIKE07_IPV6, CF_PROXY_ON), + AAAA("api", SPIKE07_IPV6, CF_PROXY_ON), A("maps", SPIKE07_IPV4, CF_PROXY_ON), - // AAAA("maps", SPIKE07_IPV6, 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("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), + AAAA("spike-08", SPIKE08_IPV6), A("@", SPIKE08_IPV4, CF_PROXY_ON), - // AAAA("@", SPIKE08_IPV6, CF_PROXY_ON), + AAAA("@", SPIKE08_IPV6, CF_PROXY_ON), A("www", SPIKE08_IPV4, CF_PROXY_ON), - // AAAA("www", SPIKE08_IPV6, CF_PROXY_ON), + AAAA("www", SPIKE08_IPV6, CF_PROXY_ON), A("api", SPIKE08_IPV4, CF_PROXY_ON), - // AAAA("api", SPIKE08_IPV6, CF_PROXY_ON), + AAAA("api", SPIKE08_IPV6, CF_PROXY_ON), A("maps", SPIKE08_IPV4, CF_PROXY_ON), - // AAAA("maps", SPIKE08_IPV6, 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("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 @@ -553,7 +553,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Managed network switches A("switch1.ams", SWITCH1AMS_IPV4), - // AAAA("switch1.ams", SWITCH1AMS_IPV6), + AAAA("switch1.ams", SWITCH1AMS_IPV6), A("switch1.dub", SWITCH1DUB_IPV4), AAAA("switch1.dub", SWITCH1DUB_IPV6), @@ -757,7 +757,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 +776,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), -- 2.39.5