X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/9ca6d4ba78e6950c2b47eee533d12e55d0aecf6b..602556a8d8087e325f5c24c1a2e6a512dd97d049:/src/tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index f336718..58d8797 100644
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -7,7 +7,7 @@ moscow:
     - 2217257
     - 2217258
   colour: "#412c84"
-  bandwidth: 175
+  bandwidth: 200
   ipv4: 5.45.248.21
   ipv6: 2a0206b8b0105065000000000000a001
   allowed:
@@ -20,9 +20,11 @@ moscow:
       - LT
       - LV
       - MN
-      - UA
     continents:
       - EU
+  denied:
+    countries:
+      - UA
   preferred:
     countries:
       - RU
@@ -36,12 +38,8 @@ amsterdam:
     - 2217259
     - 2217260
   colour: "#a1b92e"
-  bandwidth: 60
+  bandwidth: 100
   ipv4: 134.90.146.26
-  default: "xx"
-  preferred:
-    countries:
-      - ZA
 
 # Oslo, NO
 # BW Limit: 1000Mb/s
@@ -52,7 +50,7 @@ oslo:
     - 2217261
     - 2217262
   colour: "#7c1f7c"
-  bandwidth: 30
+  bandwidth: 50
   ipv4: 31.169.50.10
   default: "xx"
 
@@ -65,53 +63,80 @@ sanfrancisco:
     - 2217263
     - 2217264
   colour: "#25567b"
-  bandwidth: 20
-  ipv4: 64.62.205.202
+  bandwidth: 60
+  ipv4: 71.19.155.177
+  ipv6: 2605270000000017a80000fffe3ecdca
   preferred:
     countries:
       - CN
 
-# Lyon, FR
-# BW Limit: 100Mb/s
-lyon:
-  lat: 45.7575958
-  lon: 4.8323239
-  statuscake:
-    - 2217265
-    - 2217266
+# Lyon/Toulouse/Rennes/?, FR
+# Lyon @ 45.7575958,4.8323239 with BW limit of 100Mb/s
+# Toulouse @ 43.6044622,1.4442469
+# Rennes @ 48.10891/-1.63459
+# ? @ ?
+france:
+  lat: 46.603354
+  lon: 1.8883335
   colour: "#bf6530"
-  bandwidth: 30
-  ipv4: 77.95.65.39
-  ipv6: 2a039180000001000000000000000007
+  servers:
+    - statuscake:
+        - 2217265
+        - 2217266
+      bandwidth: 100
+      ipv4: 77.95.65.39
+      ipv6: 2a039180000001000000000000000007
+    - statuscake:
+        - 3351567
+        - 3351569
+      bandwidth: 100
+      ipv4: 91.224.148.166
+      ipv6: 2a0372208080a6000000000000000001
+    - statuscake:
+        - 3743694
+        - 3743696
+      bandwidth: 100
+      ipv4: 89.234.186.100
+      ipv6: 2a005884821c00000000000000000001
+    - statuscake:
+        - 3750719
+        - 3750717
+      bandwidth: 100
+      ipv4: 80.67.167.77
+      ipv6: 2a0bcbc0110d0001000000000000001c
+  preferred:
+    countries:
+      - FR
+      - MC
+      - RE
 
 # Falkenstein/Jena/Berlin, DE
-# Falkenstain @ 50.47822,12.33607
+# Falkenstein @ 50.47822,12.33607
 # Jena @ 50.9411,11.60085
 # Berlin @
 germany:
-  lat: 51.68959
-  lon: 12.78809
+  lat: 51.0834196
+  lon: 10.4234469
   colour: "#562781"
   servers:
     - statuscake:
         - 2217269
         - 2217270
-      bandwidth: 100
+      bandwidth: 150
       ipv4: 144.76.70.77
       ipv6: 2a0104f80191834c0000000000000002
     - statuscake:
         - 2217271
         - 2217272
-      bandwidth: 100
+      bandwidth: 150
       ipv4: 81.7.11.83
       ipv6: 2a020180000100010000000005170b53
     - statuscake:
         - 2217293
         - 2217294
-      bandwidth: 100
+      bandwidth: 150
       ipv4: 185.66.195.245
       ipv6: 2a032260200000010000000000000005
-  default: "xx"
   allowed:
     continents:
       - EU
@@ -125,7 +150,7 @@ baku:
   statuscake:
     - 2217267
     - 2217268
-  bandwidth: 20
+  bandwidth: 60
   ipv4: 94.20.20.55
   allowed:
     continents:
@@ -150,7 +175,7 @@ hsinchu:
   statuscake:
     - 2217277
     - 2217278
-  bandwidth: 50
+  bandwidth: 200
   ipv4: 140.110.240.7
   ipv6: 20010e10200002400000000000000007
   allowed:
@@ -169,9 +194,10 @@ pula:
     - 2217279
     - 2217280
   colour: "#bf9430"
-  bandwidth: 120
+  bandwidth: 80
   ipv4: 193.198.233.211
   ipv6: 20010b684cff00030000000000000003
+  default: "xx"
 
 # Osijek, HR
 osijek:
@@ -181,9 +207,10 @@ osijek:
     - 2217281
     - 2217282
   colour: "#269926"
-  bandwidth: 80
+  bandwidth: 120
   ipv4: 161.53.30.107
   ipv6: 20010b68c0ff000002215efffe40c7c4
+  default: "xx"
 
 # London, GB
 london:
@@ -194,7 +221,7 @@ london:
    - 2214077
    - 2217246
   colour: "#7ab02c"
-  bandwidth: 100
+  bandwidth: 200
   ipv4: 185.73.44.30
   ipv6: 20010ba800002c1e0000000000000000
 
@@ -206,14 +233,12 @@ corvallis:
     - 2217287
     - 2217288
   colour: "#a1285f"
-  bandwidth: 80
+  bandwidth: 200
   ipv4: 140.211.167.105
   ipv6: 2605bc8030100700000000008cdea769
   preferred:
     countries:
       - US
-      - CA
-      - MX
 
 # Budapest, HU
 budapest:
@@ -223,7 +248,7 @@ budapest:
     - 2217283
     - 2217284
   colour: "#2c3d82"
-  bandwidth: 60
+  bandwidth: 80
   ipv4: 37.17.173.8
   ipv6: 20014c480002bf04025056fffe8f5c81
 
@@ -235,7 +260,7 @@ minsk:
     - 2217285
     - 2217286
   colour: "#bfa730"
-  bandwidth: 35
+  bandwidth: 80
   ipv4: 31.130.201.40
   ipv6: 2001067c22681005021e8cfffe8c8d3b
   allowed:
@@ -253,9 +278,10 @@ aalborg:
     - 2217289
     - 2217290
   colour: "#bf8230"
-  bandwidth: 90
-  ipv4: 130.225.254.123
-  ipv6: 20010878034600000000000000000123
+  bandwidth: 160
+  ipv4: 130.225.254.109
+  ipv6: 20010878034600000000000000000109
+  default: "xx"
 
 # Zaragoza, ES
 zaragoza:
@@ -265,7 +291,7 @@ zaragoza:
     - 2217291
     - 2217292
   colour: "#bfa730"
-  bandwidth: 30
+  bandwidth: 100
   ipv4: 155.210.4.103
 
 # Athens, GR
@@ -276,20 +302,77 @@ athens:
     - 2244901
     - 2244902
   colour: "#bfa730"
-  bandwidth: 10
+  bandwidth: 80
   ipv4: 83.212.2.116
   ipv6: 200106482ffe00040000000000000116
 
-# ID
-athens:
-  lat: -5
-  lon: 120
+# Montréal, CA
+montreal:
+  lat: 45.5
+  lon: -73.566667
+  statuscake:
+    - 3155163
+    - 3155162
+  colour: "#bfa730"
+  bandwidth: 100
+  ipv4: 184.107.48.228
+  preferred:
+    countries:
+      - CA
+
+# Cape Town, ZA
+capetown:
+  lat: -33.91834
+  lon: 18.42054
   statuscake:
-    - 2534619
-    - 2534620
+    - 2217295
+    - 2217296
   colour: "#bfa730"
   bandwidth: 10
-  ipv4: 103.253.107.131
+  ipv4: 196.10.54.165
+  ipv6: 200143f801f40b00b283fefffed8dd45
+  allowed:
+    countries:
+      - BW
+      - LS
+      - MZ
+      - NA
+      - SZ
+      - ZA
+      - ZW
+
+# Viña del Mar, CL
+vinadelmar:
+  lat: -33.008099
+  lon: -71.519699
+  statuscake:
+    - 3499524
+    - 3499526
+  colour: "#bfa730"
+  bandwidth: 80
+  ipv4: 200.91.44.37
+  allowed:
+    continents:
+      - SA
+
+# Zurich, CH
+# BW Limit: 200Mb/s
+zurich:
+  lat: 47.3769434
+  lon: 8.5414061
+  statuscake:
+    - 3743984
+    - 3743985
+  colour: "#bfa730"
+  bandwidth: 200
+  ipv4: 217.71.244.22
+  ipv6: 200108e0004020390000000000000010
+  preferred:
+    countries:
+      - CH
+      - IT
+      - SM
+      - VA
 
 # Spare colours:
 #