X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/ac2e729d73b596efea709d714bb16e74b78f5b11..45e79bdfd7ea40f69b89ec8231fd84b05b57ea4a:/src/tile.openstreetmap.yml

diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml
index dca5e42..9432e16 100644
--- a/src/tile.openstreetmap.yml
+++ b/src/tile.openstreetmap.yml
@@ -29,9 +29,10 @@ moscow:
     countries:
       - RU
 
-# Amsterdam/Ede, NL
+# Amsterdam/Ede/Dronten, NL
 # Amsterdam @ 52.37306,4.89222
 # Ede @ 52.0458265,5.6702011
+# Dronten @ 52.5437235,5.7050729
 # BW Limit: 1000Mb/s
 netherlands:
   lat: 52.20944325
@@ -41,14 +42,23 @@ netherlands:
     - statuscake:
         - 2217259
         - 2217260
-      bandwidth: 60
+      bandwidth: 30
+      name: trogdor
       ipv4: 134.90.146.26
     - statuscake:
         - 5406587
         - 5406588
       bandwidth: 60
+      name: takhisis
       ipv4: 31.3.110.20
       ipv6: 2a03:7900:111:0:31:3:110:20
+    - statuscake:
+        - 5499504
+        - 5499504
+      bandwidth: 60
+      name: shruikan
+      ipv4: 45.148.169.51
+      ipv6: 2a0a:aa42:56:1000::1
 
 # Oslo, NO
 # BW Limit: 1000Mb/s
@@ -61,7 +71,6 @@ oslo:
   colour: "#ffffb3"
   bandwidth: 30
   ipv4: 31.169.50.10
-  default: "xx"
 
 # San Francisco, US
 # BW Limit: 100Mb/s ?
@@ -72,7 +81,7 @@ sanfrancisco:
     - 2217263
     - 2217264
   colour: "#e31a1c"
-  bandwidth: 60
+  bandwidth: 30
   ipv4: 71.19.155.177
   ipv6: 2605:2700:0:17:a800:ff:fe3e:cdca
   preferred:
@@ -99,30 +108,44 @@ france:
     - statuscake:
         - 3351567
         - 3351569
-      bandwidth: 100
+      bandwidth: 150
       name: noomoahk
       ipv4: 91.224.148.166
       ipv6: 2a03:7220:8080:a600::1
     - statuscake:
         - 3743694
         - 3743696
-      bandwidth: 60
+      bandwidth: 30
       name: norbert
       ipv4: 89.234.186.100
       ipv6: 2a00:5884:821c::1
-    - statuscake:
-        - 3750719
-        - 3750717
-      bandwidth: 40
-      name: necrosan
-      ipv4: 80.67.167.77
-      ipv6: 2a0b:cbc0:110d:1::1c
     - statuscake:
         - 5321339
         - 5321340
-      bandwidth: 150
+      bandwidth: 20
       name: naga
-      ipv4: 185.116.130.151
+      ipv4: 45.13.104.40
+      ipv6: 2a0b:cbc0:1101:1::41
+    - statuscake:
+        - 5434796
+        - 5434797
+      bandwidth: 40
+      name: neak
+      ipv4: 89.234.177.142
+    - statuscake:
+        - 5435908
+        - 5435909
+      bandwidth: 80
+      name: meraxes
+      ipv4: 51.15.185.90
+      ipv6: 2001:bc8:2d57:100:aa1e:84ff:fe72:e660
+    - statuscake:
+        - 5590997
+        - 5590998
+      bandwidth: 60
+      name: lockheed
+      ipv4: 176.9.171.103
+      ipv6: 2a01:4f8:13a:209::103
   preferred:
     countries:
       - FR
@@ -142,21 +165,14 @@ germany:
     - statuscake:
         - 2217269
         - 2217270
-      bandwidth: 80
+      bandwidth: 60
       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
-      bandwidth: 80
+      bandwidth: 60
       name: kalessin
       ipv4: 185.66.195.245
       ipv6: 2a03:2260:2000:1::5
@@ -167,36 +183,37 @@ germany:
       name: keizer
       ipv4: 195.201.226.63
       ipv6: 2a01:4f8:1c1c:bc54::1
+    - statuscake:
+        - 5590100
+        - 5590099
+      bandwidth: 60
+      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
+      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
@@ -227,10 +244,9 @@ pula:
     - 2217279
     - 2217280
   colour: "#a6cee3"
-  bandwidth: 120
+  bandwidth: 100
   ipv4: 193.198.233.211
   ipv6: 2001:b68:4cff:3::3
-  default: "xx"
 
 # Osijek, HR
 osijek:
@@ -240,10 +256,9 @@ osijek:
     - 2217281
     - 2217282
   colour: "#fb8072"
-  bandwidth: 120
+  bandwidth: 100
   ipv4: 161.53.30.107
   ipv6: 2001:b68:c0ff:0:221:5eff:fe40:c7c4
-  default: "xx"
 
 # London, GB
 london:
@@ -257,43 +272,43 @@ london:
       bandwidth: 150
       name: saphira
       ipv4: 185.73.44.30
-      ipv6: 2001:ba8:0:2c1e::
+      ipv6: 2001:ba8:0:2c1e::0
     - statuscake:
        - 4089249
        - 4089250
       bandwidth: 150
       name: toothless
       ipv4: 185.73.44.167
-      ipv6: 2001:ba8:0:2ca7::
+      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: 100
-      name: stormfly-01
-      ipv4: 140.211.167.104
-      ipv6: 2605:bc80:3010:700::8cde:a768
-    - statuscake:
-       - 2217287
-       - 2217288
-      bandwidth: 200
-      name: stormfly-02
-      ipv4: 140.211.167.105
-      ipv6: 2605:bc80:3010:700::8cde:a769
-  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:
@@ -423,10 +438,10 @@ zurich:
   ipv6: 2001:8e0:40:2039::10
   preferred:
     countries:
-      - CH
+#      - CH
       - IT
-      - SM
-      - VA
+#      - SM
+#      - VA
 
 # Kiev, UA
 kiev:
@@ -466,11 +481,11 @@ newzealand:
       - OC
     countries:
       - CC
-  preferred:
-    continents:
-      - OC
-    countries:
-      - CC
+#  preferred:
+#    continents:
+#      - OC
+#    countries:
+#      - CC
 
 # Melbourne, AU
 melbourne:
@@ -488,12 +503,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
@@ -518,30 +533,462 @@ sweden:
       ipv4: 130.239.18.114
       ipv6: 2001:6b0:e:2a18::114
 
-# Curitiba, BR
-curitiba:
-  lat: -25.41403745
-  lon: -49.252918753851
-  statuscake:
-    - 3945882
-    - 3945883
-  colour: "#d9d9d9"
-  bandwidth: 80
-  ipv4: 200.236.31.207
-  ipv6: 2801:82:80ff:8002:216:ccff:feaa:21
+# Curitiba/São Paulo, BR
+# Curitaba @ -25.41403745,-49.252918753851
+# São Paulo @ -23.55,-46.633333
+brazil:
+  lat: -24.482018725
+  lon: -47.9431258769255
+  colour: "#33a02c"
+  servers:
+    - statuscake:
+        - 3945882
+        - 3945883
+      bandwidth: 60
+      name: boitata
+      ipv4: 200.236.31.207
+      ipv6: 2801:82:80ff:8002:216:ccff:feaa:21
+    - statuscake:
+        - 5436765
+        - 5436766
+      bandwidth: 60
+      name: fuchur
+      ipv4: 200.25.58.164
+      ipv6: 2800:1e0:1020::44
   allowed:
     countries:
       - BR
 
-# Pilsen, CZ
-pilsen:
-  lat: 49.723689
-  lon: 13.351542
-  statuscake:
-    - 4065539
-    - 4065540
+# Pilsen/Prague, CZ
+# Pilsen @ 49.723689,13.351542
+# Prague @ 50.0874654,14.4212535
+czechia:
+  lat: 49.9055772
+  lon: 13.88639775
   colour: "#d9d9d9"
-  bandwidth: 30
-  ipv4: 147.228.60.16
+  servers:
+    - statuscake:
+        - 4065539
+        - 4065540
+      bandwidth: 30
+      name: fume
+      ipv4: 147.228.60.16
+    - statuscake:
+        - 5508363
+        - 5508364
+      bandwidth: 30
+      name: falkor
+      ipv4: 81.27.197.69
+      ipv6: 2a02:8301:0:1::69
+  allowed:
+    countries:
+      - AT
+      - CZ
+      - DE
+      - PL
+      - SK
+
+# Bogotá, CO
+bogota:
+  lat: 4.68067405
+  lon: -74.04102344908512
+  colour: "#33a02c"
+  servers:
+    - statuscake:
+        - 5434641
+        - 5434642
+      bandwidth: 40
+      name: gorwen
+      ipv4: 200.25.1.70
+      ipv6: 2800:1e0:a01:a006::6f
+    - statuscake:
+        - 5437704
+        - 5437705
+      bandwidth: 60
+      name: glaedr
+      ipv4: 200.25.1.71
+      ipv6: 2800:1e0:a01:a006::6e
+  allowed:
+    continents:
+      - NA
+      - SA
+  denied:
+    countries:
+      - CA
+      - US
+
+# Buenos Aires, AR
+buenosaires:
+  lat: -34.603333
+  lon: -58.381667
+  statuscake:
+    - 5436768
+    - 5436769
+  colour: "#33a02c"
+  bandwidth: 60
+  name: idris
+  ipv4: 200.25.60.197
+  ipv6: 2800:1e0:1030::64
+  allowed:
+    continents:
+      - NA
+      - SA
+  denied:
+    countries:
+      - 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
+#  lon: 19.00283
+#  statuscake:
+#    - 5715443
+#    - 5715444
+#  colour: "#A22E5B"
+#  bandwidth: 80
+#  name: firnen
+#  ipv4: 188.241.28.82
+
+# Fastly
+fastly:
+  global: true
+  statuscake:
+    - 5679197
+    - 5679198
+  bandwidth: 10000
+  cname: cdn-fastly-test.tile.openstreetmap.org
+  default: "xx"
+  allowed:
+    continents:
+      - AF
+      - AN
+      - AS
+      - NA
+      - OC
+      - SA
+    countries:
+      - AD
+      - AE
+      - AG
+      - AI
+      - AL
+      - AO
+      - AQ
+      - AT
+      - AX
+      - AZ
+      - BA
+      - BD
+      - BE
+      - BF
+      - BG
+      - BH
+      - BI
+      - BJ
+      - BR
+      - BM
+      - BN
+      - BS
+      - BT
+      - BY
+      - BZ
+      - CA
+      - CD
+      - CF
+      - CH
+      - CG
+      - CI
+      - CM
+      - CN
+      - CV
+      - CY
+      - CZ
+      - DJ
+      - DK
+      - DZ
+      - EE
+      - EG
+      - EH
+      - ER
+      - ET
+      - FI
+      - FO
+      - GA
+      - GB
+      - GE
+      - GG
+      - GH
+      - GI
+      - GM
+      - GN
+      - GQ
+      - GW
+      - KE
+      - HK
+      - HR
+      - HU
+      - ID
+      - IE
+      - IM
+      - IN
+      - IS
+      - IO
+      - JE
+      - JM
+      - JO
+      - JP
+      - KH
+      - KM
+      - KR
+      - KW
+      - KZ
+      - LA
+      - LB
+      - LI
+      - LK
+      - LR
+      - LT
+      - LU
+      - LV
+      - MA
+      - MC
+      - MD
+      - ME
+      - MG
+      - MK
+      - ML
+      - MM
+      - MN
+      - MO
+      - MR
+      - MT
+      - MU
+      - MV
+      - MW
+      - MX
+      - MY
+      - NE
+      - NG
+      - NO
+      - NP
+      - OM
+      - PG
+      - PH
+      - PK
+      - PL
+      - PM
+      - PT
+      - QA
+      - RE
+      - RO
+      - RS
+      - RU
+      - RW
+      - SA
+      - SC
+      - SD
+      - SE
+      - SG
+      - SI
+      - SK
+      - SL
+      - SM
+      - SN
+      - SO
+      - SS
+      - ST
+      - TC
+      - TD
+      - TG
+      - TH
+      - TJ
+      - TL
+      - TM
+      - TN
+      - TR
+      - TZ
+      - TG
+      - TW
+      - UG
+      - US
+      - UZ
+      - VA
+      - VN
+      - XK
+      - YE
+      - YT
+      - ZM
+  preferred:
+    continents:
+      - AN
+      - NA
+    countries:
+      - AD
+      - AE
+      - AG
+      - AI
+      - AL
+      - AO
+      - AQ
+      - AT
+      - AX
+      - AZ
+      - BA
+      - BD
+      - BE
+      - BF
+      - BG
+      - BH
+      - BI
+      - BJ
+      - BR
+      - BM
+      - BN
+      - BS
+      - BT
+      - BY
+      - BZ
+      - CA
+      - CD
+      - CF
+      - CG
+      - CH
+      - CI
+      - CM
+      - CN
+      - CV
+      - CY
+      - CZ
+      - DJ
+      - DK
+      - DZ
+      - EE
+      - EG
+      - EH
+      - ER
+      - ET
+      - FI
+      - FO
+      - GA
+      - GB
+      - GE
+      - GG
+      - GH
+      - GI
+      - GM
+      - GN
+      - GQ
+      - GW
+      - KE
+      - HK
+      - HR
+      - HU
+      - ID
+      - IE
+      - IM
+      - IN
+      - IS
+      - IO
+      - JE
+      - JM
+      - JO
+      - JP
+      - KH
+      - KM
+      - KR
+      - KW
+      - KZ
+      - LA
+      - LB
+      - LI
+      - LK
+      - LR
+      - LT
+      - LU
+      - LV
+      - MA
+      - MC
+      - MD
+      - ME
+      - MG
+      - MK
+      - ML
+      - MM
+      - MN
+      - MO
+      - MR
+      - MT
+      - MU
+      - MV
+      - MW
+      - MX
+      - MY
+      - NE
+      - NG
+      - NO
+      - NP
+      - OM
+      - PG
+      - PH
+      - PK
+      - PL
+      - PM
+      - PT
+      - QA
+      - RE
+      - RO
+      - RS
+      - RU
+      - RW
+      - SA
+      - SC
+      - SD
+      - SE
+      - SG
+      - SI
+      - SK
+      - SL
+      - SM
+      - SN
+      - SO
+      - SS
+      - ST
+      - TC
+      - TD
+      - TG
+      - TH
+      - TJ
+      - TL
+      - TM
+      - TN
+      - TR
+      - TZ
+      - TG
+      - TW
+      - UG
+      - US
+      - UZ
+      - VA
+      - VN
+      - XK
+      - YE
+      - YT
+      - ZM
 
 # Spare colours:
+  colour: "#1f78b4"