From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Nov 2020 19:03:42 +0000 (+0000)
Subject: Remove DNS entries for defunct machines
X-Git-Url: https://git.openstreetmap.org/dns.git/commitdiff_plain/4ea98084dd2c1a17245a271693ef41cf418c8d11

Remove DNS entries for defunct machines
---

diff --git a/src/hosts.js b/src/hosts.js
index a93214e..7b996d2 100644
--- a/src/hosts.js
+++ b/src/hosts.js
@@ -118,11 +118,6 @@ var KESSIE_OOB = "178.250.74.37";
 var KILGHARRAH_IPV4 = "176.9.47.143";
 var KILGHARRAH_IPV6 = "2a01:4f8:150:638d::2";
 
-var KOKOSNUSS_IPV4 = "85.214.255.86";
-
-var KONQI_IPV4 = "81.7.11.83";
-var KONQI_IPV6 = "2a02:180:1:1::517:b53";
-
 var KVM1_INTERNAL = "10.0.0.21";
 
 var LADON_IPV4 = "83.212.2.116";
@@ -207,9 +202,6 @@ var SAREL_OOB = "10.0.1.12";
 var SARKANY_IPV4 = "37.17.173.8";
 var SARKANY_IPV6 = "2001:4c48:2:bf04:250:56ff:fe8f:5c81";
 
-var SCORCH_IPV4 = "176.31.235.79";
-var SCORCH_IPV6 = "2001:41d0:2:fc4f::1";
-
 var SHENRON_IPV4 = "212.110.172.32";
 var SHENRON_IPV6 = "2001:41c9:1:400::32";
 var SHENRON_INTERNAL = "10.0.16.3";
@@ -217,8 +209,6 @@ var SHENRON_INTERNAL = "10.0.16.3";
 var SHRUIKAN_IPV4 = "45.148.169.51";
 var SHRUIKAN_IPV6 = "2a0a:aa42:56:1000::1";
 
-var SIMURGH_IPV4 = "94.20.20.55";
-
 var SNAP01_INTERNAL = "10.0.48.49";
 var SNAP01_OOB = "10.0.49.49";
 
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 7188ef2..7cc2286 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -191,9 +191,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ysera.ucl", YSERA_INTERNAL),
   A("ysera.oob", YSERA_OOB),
 
-  A("scorch", SCORCH_IPV4),
-  AAAA("scorch", SCORCH_IPV6),
-
   A("rhaegal", RHAEGAL_IPV4),
 
   A("pyrene", PYRENE_IPV4),
@@ -413,11 +410,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("jakelong", JAKELONG_IPV6),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
-  A("simurgh", SIMURGH_IPV4),
   A("katie", KATIE_IPV4),
   AAAA("katie", KATIE_IPV6),
-  A("konqi", KONQI_IPV4),
-  AAAA("konqi", KONQI_IPV6),
   A("longma", LONGMA_IPV4),
   AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),
@@ -487,7 +481,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("idris", IDRIS_IPV6),
   A("gackelchen", GACKELCHEN_IPV4),
   AAAA("gackelchen", GACKELCHEN_IPV6),
-  A("kokosnuss", KOKOSNUSS_IPV4),
   A("shruikan", SHRUIKAN_IPV4),
   AAAA("shruikan", SHRUIKAN_IPV6),
   A("falkor", FALKOR_IPV4),
diff --git a/src/render.openstreetmap.yml b/src/render.openstreetmap.yml
index e46234b..08e1657 100644
--- a/src/render.openstreetmap.yml
+++ b/src/render.openstreetmap.yml
@@ -40,20 +40,6 @@ ysera:
     origins:
       - london
 
-scorch:
-  lat: 50.691197900000006
-  lon: 3.2008242044777013
-  statuscake:
-    - 2217314
-  colour: "#bf8230"
-  bandwidth: 200
-  ipv4: 176.31.235.79
-  ipv6: 2001:41d0:2:fc4f::1
-  default: ""
-  preferred:
-    origins:
-      - france
-
 rhaegal:
   lat: 45.8082123
   lon: 15.9634238
@@ -102,6 +88,7 @@ albi:
 
 # Spare colours:
 #
+#  bf8230
 #  bf6530
 #  bfb830
 #  562781
diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml
index 788d45c..69b6513 100644
--- a/src/tile.openstreetmap.yml
+++ b/src/tile.openstreetmap.yml
@@ -169,13 +169,6 @@ germany:
       name: katie
       ipv4: 144.76.70.77
       ipv6: 2a01:4f8:191:834c::2
-    - statuscake:
-        - 2217271
-        - 2217272
-      bandwidth: 80
-      name: konqi
-      ipv4: 81.7.11.83
-      ipv6: 2a02:180:1:1::517:b53
     - statuscake:
         - 2217293
         - 2217294
@@ -190,12 +183,6 @@ germany:
       name: keizer
       ipv4: 195.201.226.63
       ipv6: 2a01:4f8:1c1c:bc54::1
-    - statuscake:
-        - 5466374
-        - 5466375
-      bandwidth: 60
-      name: kokosnuss
-      ipv4: 85.214.255.86
     - statuscake:
         - 5590100
         - 5590099
@@ -227,32 +214,6 @@ germany:
     countries:
       - DE
 
-# Baku, AZ
-# BW Limit: 1000Mb/s
-baku:
-  lat: 40.395278
-  lon: 49.882222
-  colour: "#1f78b4"
-  statuscake:
-    - 2217267
-    - 2217268
-  bandwidth: 60
-  ipv4: 94.20.20.55
-  allowed:
-    continents:
-      - AS
-      - EU
-  preferred:
-    countries:
-      - AZ
-  denied:
-    countries:
-      - AM
-      - CN
-      - JP
-      - KR
-      - VN
-
 # Hsinchu, TW
 hsinchu:
   lat: 24.78268
@@ -786,3 +747,4 @@ fastly:
       - YE
 
 # Spare colours:
+  colour: "#1f78b4"