Remove jakelong and tuatara from DNS

diff --git a/src/hosts.js b/src/hosts.js
index 856bc00e318111ffb64eaa9677f130afc90432c5..19ffa4f254e5e49fe2e737d2ee28f3ffc032336d 100644 (file)
--- a/src/hosts.js
+++ b/src/hosts.js
@@ -90,9 +90,6 @@ var IRONBELLY_IPV6 = "2001:978:2:2c::172:a";
 var IRONBELLY_INTERNAL = "10.0.48.10";
 var IRONBELLY_OOB = "10.0.49.10";
 
-var JAKELONG_IPV4 = "71.19.155.177";
-var JAKELONG_IPV6 = "2605:2700:0:17:a800:ff:fe3e:cdca";
-
 var KALESSIN_IPV4 = "185.66.195.245";
 var KALESSIN_IPV6 = "2a03:2260:2000:1::5";
 
@@ -330,9 +327,6 @@ var TROGDOR_OOB = "134.90.146.30";
 var TAKHISIS_IPV4 = "31.3.110.20";
 var TAKHISIS_IPV6 = "2a03:7900:111:0:31:3:110:20";
 
-var TUATARA_IPV4 = "114.23.141.203";
-var TUATARA_IPV6 = "2406:1e00:b410:c24:529a:4cff:fe79:bc3b";
-
 var URMEL_IPV4 = "193.60.236.21";
 var URMEL_INTERNAL = "10.0.0.6";
 var URMEL_OOB = "10.0.1.6";

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 91640d9de050168e2b47bed0eb9547b97045e32b..75290e399638f48c5f8f31840cb7c75f730c30ea 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -408,8 +408,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("trogdor.oob", TROGDOR_OOB),
   A("ridgeback", RIDGEBACK_IPV4),
   A("ridgeback.oob", RIDGEBACK_OOB),
-  A("jakelong", JAKELONG_IPV4),
-  AAAA("jakelong", JAKELONG_IPV6),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
   A("katie", KATIE_IPV4),
@@ -455,8 +453,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("keizer", KEIZER_IPV6),
   A("vipertooth", VIPERTOOTH_IPV4),
   AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("tuatara", TUATARA_IPV4),
-  AAAA("tuatara", TUATARA_IPV6),
   A("waima", WAIMA_IPV4),
   A("nidhogg", NIDHOGG_IPV4),
   AAAA("nidhogg", NIDHOGG_IPV6),

diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml
index f5bba5e77d81b65d4b4f339b096d8dcd5e709f1f..db542d65ae261c9f084308cfbf0277701e84cac0 100644 (file)
--- a/src/tile.openstreetmap.yml
+++ b/src/tile.openstreetmap.yml
@@ -72,22 +72,6 @@ oslo:
   bandwidth: 30
   ipv4: 31.169.50.10
 
-# San Francisco, US
-# BW Limit: 100Mb/s ?
-sanfrancisco:
-  lat: 37.708264
-  lon: -122.280247
-  statuscake:
-    - 2217263
-    - 2217264
-  colour: "#e31a1c"
-  bandwidth: 30
-  ipv4: 71.19.155.177
-  ipv6: 2605:2700:0:17:a800:ff:fe3e:cdca
-  preferred:
-    countries:
-      - CN
-
 # Lyon/Toulouse/Rennes/Paris, FR
 # Lyon @ 45.7575958,4.8323239 with BW limit of 100Mb/s
 # Toulouse @ 43.6044622,1.4442469
@@ -449,13 +433,6 @@ newzealand:
   lon: 175.0302775
   colour: "#ffff99"
   servers:
-    - statuscake:
-        - 3911508
-        - 3911509
-      bandwidth: 10
-      name: tuatara
-      ipv4: 114.23.141.203
-      ipv6: 2406:1e00:b410:c24:529a:4cff:fe79:bc3b
     - statuscake:
         - 3931336
         - 3931337