Remove top level pingdom attribute for falkenstein

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index f35d310daa33a2990220eb440d674bd40eb44684..e0c348a2f134fd8fcb0273eb2f057bced02429b3 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -35,20 +35,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:
@@ -69,7 +55,7 @@ amsterdam:
   lon: 4.89222
   pingdom: 766251
   colour: "#a1b92e"
-  bandwidth: 45
+  bandwidth: 40
   ipv4: 134.90.146.26
   default: "xx"
   preferred:
@@ -85,9 +71,7 @@ oslo:
   colour: "#7c1f7c"
   bandwidth: 30
   ipv4: 31.169.50.10
-  allowed:
-    continents:
-      - EU
+  default: "xx"
 
 # San Francisco, US
 # BW Limit: 100Mb/s ?
@@ -101,8 +85,6 @@ sanfrancisco:
   preferred:
     countries:
       - CN
-      - KR
-      - VN
 
 # Lyon, FR
 # BW Limit: 100Mb/s
@@ -114,19 +96,21 @@ lyon:
   bandwidth: 35
   ipv4: 77.95.70.166
   ipv6: 2a0391800001002100000000000000a6
-  denied:
-    countries:
-      - FR
 
 # Falkenstein, DE
 falkenstein:
   lat: 50.4782198
   lon: 12.3361987876257
-  pingdom: 834186
   colour: "#562781"
-  bandwidth: 70
-  ipv4: 5.9.150.236
-  ipv6: 2a0104f8019033eb0000000000000002
+  servers:
+    - pingdom: 834186
+      bandwidth: 70
+      ipv4: 5.9.150.236
+      ipv6: 2a0104f8019033eb0000000000000002
+    - pingdom: 1483284
+      bandwidth: 10
+      ipv4: 144.76.70.77
+      ipv6: 2a0104f80191834c0000000000000002
   default: "xx"
   allowed:
     continents:
@@ -137,19 +121,20 @@ provo:
   lat: 40.20686
   lon: -111.642765
   colour: "#1f7c65"
-  default: "xx"
   servers:
     - pingdom: 909444
-      bandwidth: 20
+      bandwidth: 15.2261
       ipv4: 192.163.219.36
     - pingdom: 909445
-      bandwidth: 20
+      bandwidth: 15.2261
       ipv4: 192.163.219.40
-  preferred:
-    countries:
-      - JP
+  allowed:
+    continents:
+      - NA
+      - SA
 
 # Baku, AZ
+# BW Limit: 1000Mb/s
 baku:
   lat: 40.395278
   lon: 49.882222
@@ -166,6 +151,7 @@ baku:
       - AZ
   denied:
     countries:
+      - AM
       - CN
       - JP
       - KR
@@ -174,16 +160,55 @@ baku:
 # Hsinchu, TW
 hsinchu:
   lat: 24.78268
-  Lon: 120.99563
+  lon: 120.99563
   colour: "#bf3030"
   pingdom: 1124306
-  bandwidth: 10
+  bandwidth: 80
   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: 30
+  ipv4: 193.198.233.211
+  ipv6: 20010b684cff00030000000000000003
+
+# London, GB
+london:
+  lat: 51.5120484
+  lon: -0.00201880060605929
+  pingdom: 1453871
+  colour: "#7ab02c"
+  bandwidth: 50
+  ipv4: 185.73.44.30
+  ipv6: 20010ba800002c1e0000000000000000
+
+# Corvallis, US
+corvallis:
+  lat: 44.5639267
+  lon: -123.274707837676
+  pingdom: 1454011
+  colour: "#a1285f"
+  bandwidth: 35
+  ipv4: 140.211.167.105
+  preferred:
+    countries:
+      - US
+      - CA
+      - MX
 
 # Spare colours:
 #
-#  bf9430
-#  7ab02c
-#  a1285f
 #  2c3d82
+#  269926