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 69b651323cba2960546d49734ca010f3da627ff1..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
@@ -190,20 +174,6 @@ germany:
       name: kilgharrah
       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
-    - statuscake:
-        - 5648863
-        - 5648862
-      bandwidth: 120
-      name: lambton
-      ipv4: 88.99.244.109
-      ipv6: 2a01:4f8:10b:492::2
     - statuscake:
       - 5715443
       - 5715444
@@ -280,36 +250,35 @@ london:
       name: toothless
       ipv4: 185.73.44.167
       ipv6: 2001:ba8:0:2ca7::0
-  default: "xx"
   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:
@@ -439,10 +408,10 @@ zurich:
   ipv6: 2001:8e0:40:2039::10
   preferred:
     countries:
-      - CH
+#      - CH
       - IT
-      - SM
-      - VA
+#      - SM
+#      - VA
 
 # Kiev, UA
 kiev:
@@ -464,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
@@ -482,11 +444,11 @@ newzealand:
       - OC
     countries:
       - CC
-  preferred:
-    continents:
-      - OC
-    countries:
-      - CC
+#  preferred:
+#    continents:
+#      - OC
+#    countries:
+#      - CC
 
 # Melbourne, AU
 melbourne:
@@ -504,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
@@ -639,20 +601,6 @@ buenosaires:
       - CA
       - US
 
-# Bissen, Luxembourg (Luxconnect DC2)
-# BW Limit: 1000Mb/s
-#bissen:
-#  lat: 49.78753315
-#  lon: 6.089517249999999
-#  statuscake:
-#    - 5457454
-#    - 5457453
-#  colour: "#A22E5B"
-#  bandwidth: 20
-#  name: gackelchen
-#  ipv4: 46.226.108.71
-#  ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c
-
 # Katowice, Poland
 #katowice:
 #  lat: 50.25349
@@ -668,83 +616,28 @@ buenosaires:
 # Fastly
 fastly:
   global: true
-  statuscake:
-    - 5679197
-    - 5679198
+  statuscake: []
   bandwidth: 10000
-  cname: cdn-fastly-test.tile.openstreetmap.org
+  cname: dualstack.osff2.map.fastly.net
+  default: "xx"
   allowed:
-    countries:
-      - AE
-      - BD
-      - BH
-      - BN
-      - BT
-      - CA
-      - CN
-      - HK
-      - ID
-      - IN
-      - IO
-      - JO
-      - JP
-      - KH
-      - KR
-      - LA
-      - LK
-      - MM
-      - MN
-      - MO
-      - MV
-      - MX
-      - MY
-      - NP
-      - OM
-      - PH
-      - PK
-      - QA
+    continents:
+      - AF
+      - AN
+      - AS
+      - EU
+      - NA
+      - OC
       - SA
-      - SG
-      - TH
-      - US
-      - VN
-      - YE
   preferred:
-    countries:
-      - AE
-      - BD
-      - BH
-      - BN
-      - BT
-      - CA
-      - CN
-      - HK
-      - ID
-      - IN
-      - IO
-      - JO
-      - JP
-      - KH
-      - KR
-      - LA
-      - LK
-      - MM
-      - MN
-      - MO
-      - MV
-      - MX
-      - MY
-      - NP
-      - OM
-      - PH
-      - PK
-      - QA
+    continents:
+      - AF
+      - AN
+      - AS
+      - EU
+      - NA
+      - OC
       - SA
-      - SG
-      - TH
-      - US
-      - VN
-      - YE
 
 # Spare colours:
   colour: "#1f78b4"