Switch agri grisu -> kessie

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 85f8b9d5f7cf3ab767816e3e2afbbaa35ea3e593..4bb224a23bbae3a6ede5e723b3c33cc0d8467ca7 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -1,14 +1,3 @@
-# Sjöbo, SE
-# BW Limit: 1000Mb/s
-sjobo:
-  lat: 55.632025
-  lon: 13.70273
-  pingdom: 546505
-  colour: "#bfa730"
-  bandwidth: 90
-  ipv4: 85.30.190.241
-  ipv6: 2a02008000003ff8022264fffe2a2714
-
 # Moscow, RU
 # BW Limit: 1000Mb/s
 moscow:
@@ -16,8 +5,9 @@ moscow:
   lon: 37.617
   pingdom: 659912
   colour: "#412c84"
-  bandwidth: 60
+  bandwidth: 120
   ipv4: 130.193.62.73
+  ipv6: 2a0206b8b0105065000000000000a001
   allowed:
     countries:
       - AZ
@@ -35,20 +25,6 @@ moscow:
     countries:
       - RU
 
-# Brisbane, AU
-# BW Limit: 1000Mb/s
-brisbane:
-  lat: -27.5
-  lon: 153.0167
-  pingdom: 657940
-  colour: "#269926"
-  bandwidth: 20
-  ipv4: 203.26.72.12
-  ipv6: 2402640000010006021708fffe5640c3
-  allowed:
-    continents:
-      - OC
-
 # Pau, FR
 # Limit 100Mb/s
 pau:
@@ -72,6 +48,9 @@ amsterdam:
   bandwidth: 40
   ipv4: 134.90.146.26
   default: "xx"
+  preferred:
+    countries:
+      - ZA
 
 # Oslo, NO
 # BW Limit: 1000Mb/s
@@ -82,9 +61,7 @@ oslo:
   colour: "#7c1f7c"
   bandwidth: 30
   ipv4: 31.169.50.10
-  allowed:
-    continents:
-      - EU
+  default: "xx"
 
 # San Francisco, US
 # BW Limit: 100Mb/s ?
@@ -93,8 +70,11 @@ sanfrancisco:
   lon: -122.280247
   pingdom: 788480
   colour: "#25567b"
-  bandwidth: 22
+  bandwidth: 20
   ipv4: 64.62.205.202
+  preferred:
+    countries:
+      - CN
 
 # Lyon, FR
 # BW Limit: 100Mb/s
@@ -103,19 +83,24 @@ lyon:
   lon: 4.8323239
   pingdom: 789594
   colour: "#bf6530"
-  bandwidth: 35
+  bandwidth: 70
   ipv4: 77.95.70.166
   ipv6: 2a0391800001002100000000000000a6
 
-# Falkenstein, DE
-falkenstein:
-  lat: 50.4782198
-  lon: 12.3361987876257
-  pingdom: 834186
+# Falkenstein/Jena, DE
+germany:
+  lat: 50.703515
+  lon: 11.96044
   colour: "#562781"
-  bandwidth: 70
-  ipv4: 5.9.150.236
-  ipv6: 2a0104f8019033eb0000000000000002
+  servers:
+    - pingdom: 1483284
+      bandwidth: 90
+      ipv4: 144.76.70.77
+      ipv6: 2a0104f80191834c0000000000000002
+    - pingdom: 1486872
+      bandwidth: 90
+      ipv4: 81.7.11.83
+      ipv6: 2a020180000100010000000005170b53
   default: "xx"
   allowed:
     continents:
@@ -126,7 +111,6 @@ provo:
   lat: 40.20686
   lon: -111.642765
   colour: "#1f7c65"
-  default: "xx"
   servers:
     - pingdom: 909444
       bandwidth: 30
@@ -134,14 +118,19 @@ provo:
     - pingdom: 909445
       bandwidth: 30
       ipv4: 192.163.219.40
+  allowed:
+    continents:
+      - NA
+      - SA
 
 # Baku, AZ
+# BW Limit: 1000Mb/s
 baku:
   lat: 40.395278
   lon: 49.882222
   colour: "#bfb830"
   pingdom: 1064415
-  bandwidth: 40
+  bandwidth: 50
   ipv4: 94.20.20.55
   allowed:
     continents:
@@ -150,11 +139,97 @@ baku:
   preferred:
     countries:
       - AZ
+  denied:
+    countries:
+      - AM
+      - CN
+      - JP
+      - KR
+      - VN
+
+# Hsinchu, TW
+hsinchu:
+  lat: 24.78268
+  lon: 120.99563
+  colour: "#bf3030"
+  pingdom: 1124306
+  bandwidth: 50
+  ipv4: 140.110.240.7
+  ipv6: 20010e10200002400000000000000007
+  allowed:
+    continents:
+      - AS
+  preferred:
+    countries:
+      - TW
+      - JP
+
+# Pula, HR
+pula:
+  lat: 44.866280
+  lon: 13.851520
+  pingdom: 1453872
+  colour: "#bf9430"
+  bandwidth: 60
+  ipv4: 193.198.233.211
+  ipv6: 20010b684cff00030000000000000003
+
+# Osijek, HR
+osijek:
+  lat: 45.55656
+  lon: 18.71212
+  pingdom: 1840482
+  colour: "#269926"
+  bandwidth: 30
+  ipv4: 161.53.30.107
+  ipv6: 20010b68c0ff000002215efffe40c7c4
+
+# London, GB
+london:
+  lat: 51.5120484
+  lon: -0.00201880060605929
+  pingdom: 1453871
+  colour: "#7ab02c"
+  bandwidth: 60
+  ipv4: 185.73.44.30
+  ipv6: 20010ba800002c1e0000000000000000
+
+# Corvallis, US
+corvallis:
+  lat: 44.5639267
+  lon: -123.274707837676
+  pingdom: 1454011
+  colour: "#a1285f"
+  bandwidth: 60
+  ipv4: 140.211.167.105
+  preferred:
+    countries:
+      - US
+      - CA
+      - MX
+
+# Budapest, HU
+budapest:
+  lat: 47.4925
+  lon: 19.051389
+  pingdom: 1530226
+  colour: "#2c3d82"
+  bandwidth: 30
+  ipv4: 37.17.173.8
+  ipv6: 20014c480002bf04025056fffe8f5c81
+
+# Minsk, BY
+minsk:
+  lat: 53.88586
+  lon: 27.45368
+  pingdom: 1941482
+  colour: "#bfa730"
+  bandwidth: 10
+  ipv4: 31.130.201.40
+  ipv6: 2001067c22681005021e8cfffe8c8d3b
+  allowed:
+    countries:
+      - BY
 
 # Spare colours:
 #
-#  bf3030
-#  bf9430
-#  7ab02c
-#  a1285f
-#  2c3d82