tile render: Move more load to orm over yevaud

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 7aebfc90ec944a2cee9437f44ce2748b488520e5..7d74a08614d5632cac8979c0bc6f76e55afa5a87 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -16,7 +16,7 @@ moscow:
   lon: 37.617
   pingdom: 659912
   colour: "#412c84"
-  bandwidth: 55
+  bandwidth: 60
   ipv4: 130.193.62.73
   allowed:
     countries:
@@ -69,9 +69,12 @@ amsterdam:
   lon: 4.89222
   pingdom: 766251
   colour: "#a1b92e"
-  bandwidth: 50
+  bandwidth: 45
   ipv4: 134.90.146.26
   default: "xx"
+  preferred:
+    countries:
+      - ZA
 
 # Oslo, NO
 # BW Limit: 1000Mb/s
@@ -95,6 +98,11 @@ sanfrancisco:
   colour: "#25567b"
   bandwidth: 22
   ipv4: 64.62.205.202
+  preferred:
+    countries:
+      - CN
+      - KR
+      - VN
 
 # Lyon, FR
 # BW Limit: 100Mb/s
@@ -103,19 +111,12 @@ lyon:
   lon: 4.8323239
   pingdom: 789594
   colour: "#bf6530"
-  bandwidth: 30
+  bandwidth: 35
   ipv4: 77.95.70.166
-  ipv6: 200107f80047002100000000000000a6
-
-# Beauharnois, CA
-beauharnois:
-  lat: 45.308402
-  lon: -73.893557
-  pingdom: 824231
-  colour: "#bfb830"
-  bandwidth: 50
-  ipv4: 142.4.213.166
-  ipv6: 26075300006012a60000000000000001
+  ipv6: 2a0391800001002100000000000000a6
+  denied:
+    countries:
+      - FR
 
 # Falkenstein, DE
 falkenstein:
@@ -123,9 +124,10 @@ falkenstein:
   lon: 12.3361987876257
   pingdom: 834186
   colour: "#562781"
-  bandwidth: 50
+  bandwidth: 70
   ipv4: 5.9.150.236
   ipv6: 2a0104f8019033eb0000000000000002
+  default: "xx"
   allowed:
     continents:
       - EU
@@ -135,6 +137,7 @@ provo:
   lat: 40.20686
   lon: -111.642765
   colour: "#1f7c65"
+  default: "xx"
   servers:
     - pingdom: 909444
       bandwidth: 30
@@ -142,6 +145,31 @@ provo:
     - pingdom: 909445
       bandwidth: 30
       ipv4: 192.163.219.40
+  preferred:
+    countries:
+      - JP
+
+# Baku, AZ
+baku:
+  lat: 40.395278
+  lon: 49.882222
+  colour: "#bfb830"
+  pingdom: 1064415
+  bandwidth: 45
+  ipv4: 94.20.20.55
+  allowed:
+    continents:
+      - AS
+      - EU
+  preferred:
+    countries:
+      - AZ
+  denied:
+    countries:
+      - CN
+      - JP
+      - KR
+      - VN
 
 # Spare colours:
 #