Tweak rules for tuatara

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index fce663596c5ebc6249c494ac0f036e2aa6b35013..64217e685be23eb35ed0707e1302322b6772cca9 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -6,7 +6,7 @@ moscow:
   statuscake:
     - 2217257
     - 2217258
-  colour: "#412c84"
+  colour: "#8dd3c7"
   bandwidth: 200
   ipv4: 5.45.248.21
   ipv6: 2a0206b8b0105065000000000000a001
@@ -37,8 +37,8 @@ amsterdam:
   statuscake:
     - 2217259
     - 2217260
-  colour: "#a1b92e"
-  bandwidth: 80
+  colour: "#bebada"
+  bandwidth: 100
   ipv4: 134.90.146.26
 
 # Oslo, NO
@@ -49,8 +49,8 @@ oslo:
   statuscake:
     - 2217261
     - 2217262
-  colour: "#7c1f7c"
-  bandwidth: 50
+  colour: "#ffffb3"
+  bandwidth: 30
   ipv4: 31.169.50.10
   default: "xx"
 
@@ -62,54 +62,68 @@ sanfrancisco:
   statuscake:
     - 2217263
     - 2217264
-  colour: "#25567b"
-  bandwidth: 40
+  colour: "#e31a1c"
+  bandwidth: 60
   ipv4: 71.19.155.177
   ipv6: 2605270000000017a80000fffe3ecdca
   preferred:
     countries:
       - CN
 
-# Lyon/Toulouse, FR
+# Lyon/Toulouse/Rennes/Paris, FR
 # Lyon @ 45.7575958,4.8323239 with BW limit of 100Mb/s
 # Toulouse @ 43.6044622,1.4442469
 # Rennes @ 48.10891/-1.63459
+# Paris @ 48.8695940,2.3437840
 france:
-  lat: 45.823655
-  lon: 1.5473269
-  colour: "#bf6530"
+  lat: 46.603354
+  lon: 1.8883335
+  colour: "#fccde5"
   servers:
     - statuscake:
         - 2217265
         - 2217266
-      bandwidth: 40
+      bandwidth: 100
       ipv4: 77.95.65.39
       ipv6: 2a039180000001000000000000000007
     - statuscake:
         - 3351567
         - 3351569
-      bandwidth: 40
+      bandwidth: 100
       ipv4: 91.224.148.166
       ipv6: 2a0372208080a6000000000000000001
     - statuscake:
         - 3743694
         - 3743696
-      bandwidth: 40
+      bandwidth: 100
       ipv4: 89.234.186.100
       ipv6: 2a005884821c00000000000000000001
+    - statuscake:
+        - 3750719
+        - 3750717
+      bandwidth: 100
+      ipv4: 80.67.167.77
+      ipv6: 2a0bcbc0110d0001000000000000001c
+    - statuscake:
+        - 3794330
+        - 3794331
+      bandwidth: 100
+      ipv4: 185.216.27.232
   preferred:
     countries:
       - FR
+      - MC
       - RE
 
 # Falkenstein/Jena/Berlin, DE
 # Falkenstein @ 50.47822,12.33607
 # Jena @ 50.9411,11.60085
 # Berlin @
+# Nuremberg @ 49.44927,11.01402
 germany:
-  lat: 51.68959
-  lon: 12.78809
-  colour: "#562781"
+  lat: 51.0834196
+  lon: 10.4234469
+  colour: "#b2df8a"
   servers:
     - statuscake:
         - 2217269
@@ -129,6 +143,12 @@ germany:
       bandwidth: 150
       ipv4: 185.66.195.245
       ipv6: 2a032260200000010000000000000005
+    - statuscake:
+        - 3750847
+        - 3750842
+      bandwidth: 150
+      ipv4: 195.201.226.63
+      ipv6: 2a0104f81c1cbc540000000000000001
   allowed:
     continents:
       - EU
@@ -138,11 +158,11 @@ germany:
 baku:
   lat: 40.395278
   lon: 49.882222
-  colour: "#bfb830"
+  colour: "#1f78b4"
   statuscake:
     - 2217267
     - 2217268
-  bandwidth: 50
+  bandwidth: 60
   ipv4: 94.20.20.55
   allowed:
     continents:
@@ -163,11 +183,11 @@ baku:
 hsinchu:
   lat: 24.78268
   lon: 120.99563
-  colour: "#bf3030"
+  colour: "#33a02c"
   statuscake:
     - 2217277
     - 2217278
-  bandwidth: 120
+  bandwidth: 200
   ipv4: 140.110.240.7
   ipv6: 20010e10200002400000000000000007
   allowed:
@@ -177,6 +197,9 @@ hsinchu:
     countries:
       - TW
       - JP
+  denied:
+    countries:
+      - ID
 
 # Pula, HR
 pula:
@@ -185,8 +208,8 @@ pula:
   statuscake:
     - 2217279
     - 2217280
-  colour: "#bf9430"
-  bandwidth: 70
+  colour: "#a6cee3"
+  bandwidth: 80
   ipv4: 193.198.233.211
   ipv6: 20010b684cff00030000000000000003
   default: "xx"
@@ -198,8 +221,8 @@ osijek:
   statuscake:
     - 2217281
     - 2217282
-  colour: "#269926"
-  bandwidth: 80
+  colour: "#fb8072"
+  bandwidth: 120
   ipv4: 161.53.30.107
   ipv6: 20010b68c0ff000002215efffe40c7c4
   default: "xx"
@@ -212,10 +235,15 @@ london:
   statuscake:
    - 2214077
    - 2217246
-  colour: "#7ab02c"
-  bandwidth: 150
+  colour: "#ffed6f"
+  bandwidth: 200
   ipv4: 185.73.44.30
   ipv6: 20010ba800002c1e0000000000000000
+  preferred:
+    countries:
+      - GB
+      - IE
+      - IM
 
 # Corvallis, US
 corvallis:
@@ -224,8 +252,8 @@ corvallis:
   statuscake:
     - 2217287
     - 2217288
-  colour: "#a1285f"
-  bandwidth: 170
+  colour: "#6a3d9a"
+  bandwidth: 200
   ipv4: 140.211.167.105
   ipv6: 2605bc8030100700000000008cdea769
   preferred:
@@ -239,8 +267,8 @@ budapest:
   statuscake:
     - 2217283
     - 2217284
-  colour: "#2c3d82"
-  bandwidth: 60
+  colour: "#fdbf6f"
+  bandwidth: 80
   ipv4: 37.17.173.8
   ipv6: 20014c480002bf04025056fffe8f5c81
 
@@ -251,7 +279,7 @@ minsk:
   statuscake:
     - 2217285
     - 2217286
-  colour: "#bfa730"
+  colour: "#ffed6f"
   bandwidth: 80
   ipv4: 31.130.201.40
   ipv6: 2001067c22681005021e8cfffe8c8d3b
@@ -269,8 +297,8 @@ aalborg:
   statuscake:
     - 2217289
     - 2217290
-  colour: "#bf8230"
-  bandwidth: 90
+  colour: "#80b1d3"
+  bandwidth: 160
   ipv4: 130.225.254.109
   ipv6: 20010878034600000000000000000109
   default: "xx"
@@ -282,8 +310,8 @@ zaragoza:
   statuscake:
     - 2217291
     - 2217292
-  colour: "#bfa730"
-  bandwidth: 70
+  colour: "#fdb462"
+  bandwidth: 100
   ipv4: 155.210.4.103
 
 # Athens, GR
@@ -293,8 +321,8 @@ athens:
   statuscake:
     - 2244901
     - 2244902
-  colour: "#bfa730"
-  bandwidth: 40
+  colour: "#b3de69"
+  bandwidth: 80
   ipv4: 83.212.2.116
   ipv6: 200106482ffe00040000000000000116
 
@@ -305,7 +333,7 @@ montreal:
   statuscake:
     - 3155163
     - 3155162
-  colour: "#bfa730"
+  colour: "#b15928"
   bandwidth: 100
   ipv4: 184.107.48.228
   preferred:
@@ -319,7 +347,7 @@ capetown:
   statuscake:
     - 2217295
     - 2217296
-  colour: "#bfa730"
+  colour: "#cab2d6"
   bandwidth: 10
   ipv4: 196.10.54.165
   ipv6: 200143f801f40b00b283fefffed8dd45
@@ -340,24 +368,71 @@ vinadelmar:
   statuscake:
     - 3499524
     - 3499526
-  colour: "#bfa730"
-  bandwidth: 50
+  colour: "#ff7f00"
+  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: 40
+  colour: "#ccebc5"
+  bandwidth: 200
   ipv4: 217.71.244.22
   ipv6: 200108e0004020390000000000000010
+  preferred:
+    countries:
+      - CH
+      - IT
+      - SM
+      - VA
+
+# Kiev, UA
+kiev:
+  lat: 50.4020865
+  lon: 30.6146803128848
+  statuscake:
+    - 3890448
+    - 3890447
+  colour: "#fb9a99"
+  bandwidth: 70
+  ipv4: 176.122.99.101
+  ipv6: 2001067c2d4000000000000000000065
+
+# Wellington, NZ
+wellington:
+  lat: -41.288889
+  lon: 174.777222
+  statuscake:
+    - 3911508
+    - 3911509
+  colour: "#ffff99"
+  bandwidth: 40
+  ipv4: 103.106.66.202
+  allowed:
+    countries:
+      - AU
+      - CC
+      - CX
+      - HM
+      - NC
+      - NF
+      - NZ
+  preferred:
+    countries:
+      - AU
+      - CC
+      - CX
+      - HM
+      - NF
+      - NZ
 
 # Spare colours:
-#
+# #999999, #d9d9d9