From 172a49f7c2f12216b2fe2ad00d5b0e034a8ccb6c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 20 Sep 2021 18:26:43 +0100
Subject: [PATCH] Add addresses for Equinix Dublin machines

---
 src/hosts.js         | 60 +++++++++++++++++++++++++++++++++++++++++---
 src/openstreetmap.js | 24 +++++++++++++++---
 2 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/hosts.js b/src/hosts.js
index dac9b1d..fc3bf95 100644
--- a/src/hosts.js
+++ b/src/hosts.js
@@ -17,6 +17,11 @@ var CLIFFORD_IPV4 = "193.60.236.11";
 var CLIFFORD_INTERNAL = "10.0.0.17";
 var CLIFFORD_OOB = "10.0.1.17";
 
+var CULEBRE_IPV4 = "184.104.226.105";
+var CULEBRE_IPV6 = "2001:470:1:b3b::9";
+var CULEBRE_INTERNAL = "10.0.64.9";
+var CULEBRE_OOB = "10.0.65.9";
+
 var DRACO_IPV4 = "193.60.236.12";
 var DRACO_INTERNAL = "10.0.0.11";
 var DRACO_OOB = "10.0.1.11";
@@ -40,6 +45,11 @@ var EUSTACE_IPV4 = "193.60.236.14";
 var EUSTACE_INTERNAL = "10.0.0.9";
 var EUSTACE_OOB = "10.0.1.9";
 
+var FAFNIR_IPV4 = "184.104.226.98";
+var FAFNIR_IPV6 = "2001:470:1:b3b::2";
+var FAFNIR_INTERNAL = "10.0.64.2";
+var FAFNIR_OOB = "10.0.65.2";
+
 var FIRNEN_IPV4 = "188.241.28.82";
 
 var FUME_IPV4 = "147.228.60.16";
@@ -56,6 +66,11 @@ var GRISU_IPV6 = "2001:41c9:2:d6::20";
 var GRISU_INTERNAL = "10.0.32.20";
 var GRISU_OOB = "10.0.33.20";
 
+var IDRIS_IPV4 = "184.104.226.102";
+var IDRIS_IPV6 = "2001:470:1:b3b::6";
+var IDRIS_INTERNAL = "10.0.64.6";
+var IDRIS_OOB = "10.0.65.6";
+
 var IRONBELLY_IPV4 = "130.117.76.10";
 var IRONBELLY_IPV6 = "2001:978:2:2c::172:a";
 var IRONBELLY_INTERNAL = "10.0.48.10";
@@ -71,6 +86,11 @@ var KESSIE_IPV4 = "178.250.74.36";
 var KESSIE_IPV6 = "2a02:1658:4:0:dad3:85ff:fe5d:875e";
 var KESSIE_OOB = "178.250.74.37";
 
+var KONQI_IPV4 = "184.104.226.103";
+var KONQI_IPV6 = "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";
@@ -79,6 +99,11 @@ var LADON_IPV6 = "2001:648:2ffe:4::116";
 var MERAXES_IPV4 = "51.15.185.90";
 var MERAXES_IPV6 = "2001:bc8:2d57:100:aa1e:84ff:fe72:e660";
 
+var NAGA_IPV4 = "184.104.226.104";
+var NAGA_IPV6 = "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 NECROSAN_IPV4 = "45.85.134.91";
@@ -96,14 +121,20 @@ var ODIN_IPV6 = "2001:978:2:2c::172:f";
 var ODIN_INTERNAL = "10.0.48.15";
 var ODIN_OOB = "10.0.49.15";
 
+var OOB1DUB_INTERNAL = "10.0.64.102";
+
 var ORM_IPV4 = "130.117.76.3";
 var ORM_IPV6 = "2001:978:2:2c::172:3";
 var ORM_INTERNAL = "10.0.48.3";
 var ORM_OOB = "10.0.49.3";
 
-var PDU1_INTERNAL = "10.0.48.100";
+var PDU1AMS_INTERNAL = "10.0.48.100";
+
+var PDU2AMS_INTERNAL = "10.0.48.101";
 
-var PDU2_INTERNAL = "10.0.48.101";
+var PDU1DUB_INTERNAL = "10.0.64.100";
+
+var PDU2DUB_INTERNAL = "10.0.64.101";
 
 var PUMMELZACKEN_IPV4 = "193.60.236.18";
 var PUMMELZACKEN_INTERNAL = "10.0.0.20";
@@ -144,6 +175,24 @@ 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 = "184.104.226.99";
+var SPIKE01_IPV6 = "2001:470:1:b3b::3";
+var SPIKE01_INTERNAL = "10.0.64.3";
+var SPIKE01_OOB = "10.0.65.3";
+
+var SPIKE02_IPV4 = "184.104.226.100";
+var SPIKE02_IPV6 = "2001:470:1:b3b::4";
+var SPIKE02_INTERNAL = "10.0.64.4";
+var SPIKE02_OOB = "10.0.65.4";
+
+var SPIKE03_IPV4 = "184.104.226.101";
+var SPIKE03_IPV6 = "2001:470:1:b3b::5";
+var SPIKE03_INTERNAL = "10.0.64.5";
+var SPIKE03_OOB = "10.0.65.5";
+
 var SPIKE04_IPV4 = "89.16.162.21";
 var SPIKE04_IPV6 = "2001:41c9:2:d6::21";
 var SPIKE04_INTERNAL = "10.0.32.21";
@@ -177,8 +226,11 @@ var STORMFLY04_IPV4 = "140.211.167.100";
 var STORMFLY04_IPV6 = "2605:bc80:3010:700::8cd3:a764";
 var STORMFLY04_OOB = "10.0.0.3";
 
-var SWITCH1_IPV4 = "130.117.76.2";
-var SWITCH1_IPV6 = "2001:978:2:2c::172:2";
+var SWITCH1AMS_IPV4 = "130.117.76.2";
+var SWITCH1AMS_IPV6 = "2001:978:2:2c::172:2";
+
+var SWITCH1DUB_IPV4 = "184.104.226.97";
+var SWITCH1DUB_IPV6 = "2001:470:1:b3b::1";
 
 var TABALUGA_IPV4 = "130.117.76.14";
 var TABALUGA_IPV6 = "2001:978:2:2c::172:e";
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 5f646fe..4d5271e 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -425,13 +425,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Managed network switches
 
-  A("switch1", SWITCH1_IPV4),
-  AAAA("switch1", SWITCH1_IPV6),
+  A("switch1.ams", SWITCH1AMS_IPV4),
+  AAAA("switch1.ams", SWITCH1AMS_IPV6),
+
+  A("switch1.dub", SWITCH1DUB_IPV4),
+  AAAA("switch1.dub", SWITCH1DUB_IPV6),
 
   // Managed power strips
 
-  A("pdu1.ams", PDU1_INTERNAL),
-  A("pdu2.ams", PDU2_INTERNAL),
+  A("pdu1.ams", PDU1AMS_INTERNAL),
+  A("pdu2.ams", PDU2AMS_INTERNAL),
+
+  A("pdu1.dub", PDU1DUB_INTERNAL),
+  A("pdu2.dub", PDU2DUB_INTERNAL),
+
+  // Out of band access servers
+
+  A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
 
@@ -554,6 +564,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Spare
 
+  A("idris", IDRIS_IPV4),
+  AAAA("idris", IDRIS_IPV6),
+  A("konqi", KONQI_IPV4),
+  AAAA("konqi", KONQI_IPV6),
+  A("naga", NAGA_IPV4),
+  AAAA("naga", NAGA_IPV6),
 
   // Donation site
 
-- 
2.39.5