Remove jakelong and tuatara from DNS

[dns.git] / src / tile.openstreetmap.yml

diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml
index 02bdb255254583d5c2a5f6c77a6ef6fafa7dea47..db542d65ae261c9f084308cfbf0277701e84cac0 100644 (file)
--- a/src/tile.openstreetmap.yml
+++ b/src/tile.openstreetmap.yml
@@ -42,7 +42,7 @@ netherlands:
     - statuscake:
         - 2217259
         - 2217260
-      bandwidth: 60
+      bandwidth: 30
       name: trogdor
       ipv4: 134.90.146.26
     - statuscake:
@@ -71,23 +71,6 @@ oslo:
   colour: "#ffffb3"
   bandwidth: 30
   ipv4: 31.169.50.10
-  default: "xx"
-
-# San Francisco, US
-# BW Limit: 100Mb/s ?
-sanfrancisco:
-  lat: 37.708264
-  lon: -122.280247
-  statuscake:
-    - 2217263
-    - 2217264
-  colour: "#e31a1c"
-  bandwidth: 60
-  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
@@ -120,13 +103,6 @@ france:
       name: norbert
       ipv4: 89.234.186.100
       ipv6: 2a00:5884:821c::1
-    - statuscake:
-        - 3750719
-        - 3750717
-      bandwidth: 20
-      name: necrosan
-      ipv4: 80.67.167.77
-      ipv6: 2a0b:cbc0:110d:1::1c
     - statuscake:
         - 5321339
         - 5321340
@@ -177,13 +153,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
@@ -198,12 +167,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
@@ -212,42 +175,15 @@ germany:
       ipv4: 176.9.47.143
       ipv6: 2a01:4f8:150:638d::2
     - statuscake:
-        - 5457454
-        - 5457453
-      bandwidth: 120
-      name: gackelchen
-      ipv4: 46.226.108.71
-      ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c
+      - 5715443
+      - 5715444
+      bandwidth: 80
+      name: firnen
+      ipv4: 188.241.28.82
   allowed:
     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
@@ -281,7 +217,6 @@ pula:
   bandwidth: 100
   ipv4: 193.198.233.211
   ipv6: 2001:b68:4cff:3::3
-  default: "xx"
 
 # Osijek, HR
 osijek:
@@ -294,7 +229,6 @@ osijek:
   bandwidth: 100
   ipv4: 161.53.30.107
   ipv6: 2001:b68:c0ff:0:221:5eff:fe40:c7c4
-  default: "xx"
 
 # London, GB
 london:
@@ -318,33 +252,33 @@ london:
       ipv6: 2001:ba8:0:2ca7::0
   preferred:
     countries:
-      - GB
+#      - GB
       - IE
       - IM
 
 # Corvallis, US
-corvallis:
-  lat: 44.5639267
-  lon: -123.274707837676
-  colour: "#6a3d9a"
-  servers:
-    - statuscake:
-       - 5434496
-       - 5434497
-      bandwidth: 200
-      name: stormfly-03
-      ipv4: 140.211.167.99
-      ipv6: 2605:bc80:3010:700::8cd3:a763
-    - statuscake:
-       - 2217287
-       - 5560091
-      bandwidth: 200
-      name: stormfly-04
-      ipv4: 140.211.167.100
-      ipv6: 2605:bc80:3010:700::8cd3:a764
-  preferred:
-    countries:
-      - US
+#corvallis:
+#  lat: 44.5639267
+#  lon: -123.274707837676
+#  colour: "#6a3d9a"
+#  servers:
+#    - statuscake:
+#       - 5434496
+#       - 5434497
+#      bandwidth: 200
+#      name: stormfly-03
+#      ipv4: 140.211.167.99
+#      ipv6: 2605:bc80:3010:700::8cd3:a763
+#    - statuscake:
+#       - 2217287
+#       - 5560091
+#      bandwidth: 200
+#      name: stormfly-04
+#      ipv4: 140.211.167.100
+#      ipv6: 2605:bc80:3010:700::8cd3:a764
+#  preferred:
+#    countries:
+#      - US
 
 # Budapest, HU
 budapest:
@@ -474,10 +408,10 @@ zurich:
   ipv6: 2001:8e0:40:2039::10
   preferred:
     countries:
-      - CH
+#      - CH
       - IT
-      - SM
-      - VA
+#      - SM
+#      - VA
 
 # Kiev, UA
 kiev:
@@ -499,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
@@ -517,11 +444,11 @@ newzealand:
       - OC
     countries:
       - CC
-  preferred:
-    continents:
-      - OC
-    countries:
-      - CC
+#  preferred:
+#    continents:
+#      - OC
+#    countries:
+#      - CC
 
 # Melbourne, AU
 melbourne:
@@ -539,12 +466,12 @@ melbourne:
     countries:
       - CC
       - ID
-  preferred:
-    continents:
-      - OC
-    countries:
-      - CC
-      - ID
+#  preferred:
+#    continents:
+#      - OC
+#    countries:
+#      - CC
+#      - ID
 
 # Linköping/Umeå, SE
 # Linköping @ 58.403261,15.623611189797
@@ -674,18 +601,43 @@ buenosaires:
       - CA
       - US
 
-# Bissen, Luxembourg (Luxconnect DC2)
-# BW Limit: 1000Mb/s
-#bissen:
-#  lat: 49.78753315
-#  lon: 6.089517249999999
+# Katowice, Poland
+#katowice:
+#  lat: 50.25349
+#  lon: 19.00283
 #  statuscake:
-#    - 5457454
-#    - 5457453
+#    - 5715443
+#    - 5715444
 #  colour: "#A22E5B"
-#  bandwidth: 20
-#  name: gackelchen
-#  ipv4: 46.226.108.71
-#  ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c
+#  bandwidth: 80
+#  name: firnen
+#  ipv4: 188.241.28.82
+
+# Fastly
+fastly:
+  global: true
+  statuscake: []
+  bandwidth: 10000
+  cname: dualstack.osff2.map.fastly.net
+  default: "xx"
+  allowed:
+    continents:
+      - AF
+      - AN
+      - AS
+      - EU
+      - NA
+      - OC
+      - SA
+  preferred:
+    continents:
+      - AF
+      - AN
+      - AS
+      - EU
+      - NA
+      - OC
+      - SA
 
 # Spare colours:
+  colour: "#1f78b4"