Update addresses for spikes in Amsterdam

diff --git a/src/hosts.js b/src/hosts.js
index 770a498c73cd303a21a63eff019450d0017f5e52..29eca8c5b58ad6e8182a9ba41091ce3b823740d2 100644 (file)
--- a/src/hosts.js
+++ b/src/hosts.js
@@ -185,20 +185,20 @@ var SPIKE03_IPV6 = "2001:470:1:b3b::5";
 var SPIKE03_INTERNAL = "10.0.64.5";
 var SPIKE03_OOB = "10.0.65.5";
 
 var SPIKE03_INTERNAL = "10.0.64.5";
 var SPIKE03_OOB = "10.0.65.5";
 

-var SPIKE06_IPV4 = "184.104.179.139";
-var SPIKE06_IPV6 = "2001:470:1:fa1::b";
-var SPIKE06_INTERNAL = "10.0.48.11";
-var SPIKE06_OOB = "10.0.49.11";
-
-var SPIKE07_IPV4 = "184.104.179.140";
-var SPIKE07_IPV6 = "2001:470:1:fa1::c";
-var SPIKE07_INTERNAL = "10.0.48.12";
-var SPIKE07_OOB = "10.0.49.12";
-
-var SPIKE08_IPV4 = "184.104.179.141";
-var SPIKE08_IPV6 = "2001:470:1:fa1::d";
-var SPIKE08_INTERNAL = "10.0.48.13";
-var SPIKE08_OOB = "10.0.49.13";
+var SPIKE06_IPV4 = "184.104.179.134";
+var SPIKE06_IPV6 = "2001:470:1:fa1::6";
+var SPIKE06_INTERNAL = "10.0.48.6";
+var SPIKE06_OOB = "10.0.49.6";
+
+var SPIKE07_IPV4 = "184.104.179.135";
+var SPIKE07_IPV6 = "2001:470:1:fa1::7";
+var SPIKE07_INTERNAL = "10.0.48.7";
+var SPIKE07_OOB = "10.0.49.7";
+
+var SPIKE08_IPV4 = "184.104.179.136";
+var SPIKE08_IPV6 = "2001:470:1:fa1::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_IPV4 = "140.211.167.99";
 var STORMFLY03_IPV6 = "2605:bc80:3010:700::8cd3:a763";

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 7667f60530833027d2990e4a61a7ef8f78370bab..9ef20e6ab63a36ad4439c34fc64467557c39b7b8 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -174,10 +174,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("spike-01", SPIKE01_IPV4),
   AAAA("spike-01", SPIKE01_IPV6),
 
   A("spike-01", SPIKE01_IPV4),
   AAAA("spike-01", SPIKE01_IPV6),

-  A("@", SPIKE01_IPV4, CF_PROXY_ON),
-  AAAA("@", SPIKE01_IPV6, CF_PROXY_ON),
-  A("www", SPIKE01_IPV4, CF_PROXY_ON),
-  AAAA("www", SPIKE01_IPV6, CF_PROXY_ON),
+  // 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),
   // A("api", SPIKE01_IPV4),
   // AAAA("api", SPIKE01_IPV6),
   // A("maps", SPIKE01_IPV4),


@@ -223,12 +223,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE06_IPV6, CF_PROXY_ON),
   A("www", SPIKE06_IPV4, CF_PROXY_ON),
   AAAA("www", 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),

-  A("api", SPIKE06_IPV4),
-  AAAA("api", SPIKE06_IPV6),
-  A("maps", SPIKE06_IPV4),
-  AAAA("maps", SPIKE06_IPV6),
-  A("mapz", SPIKE06_IPV4),
-  AAAA("mapz", SPIKE06_IPV6),
+  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-06.ams", SPIKE06_INTERNAL),
   A("spike-06.oob", SPIKE06_OOB),
 


@@ -238,12 +238,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE07_IPV6, CF_PROXY_ON),
   A("www", SPIKE07_IPV4, CF_PROXY_ON),
   AAAA("www", 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),

-  A("api", SPIKE07_IPV4),
-  AAAA("api", SPIKE07_IPV6),
-  A("maps", SPIKE07_IPV4),
-  AAAA("maps", SPIKE07_IPV6),
-  A("mapz", SPIKE07_IPV4),
-  AAAA("mapz", SPIKE07_IPV6),
+  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-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 


@@ -253,12 +253,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE08_IPV6, CF_PROXY_ON),
   A("www", SPIKE08_IPV4, CF_PROXY_ON),
   AAAA("www", 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),

-  A("api", SPIKE08_IPV4),
-  AAAA("api", SPIKE08_IPV6),
-  A("maps", SPIKE08_IPV4),
-  AAAA("maps", SPIKE08_IPV6),
-  A("mapz", SPIKE08_IPV4),
-  AAAA("mapz", SPIKE08_IPV6),
+  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-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),