tilecache: longma restricted to Asia and fix preferred countries

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 90c36633871cf4076feaad5a815e4a80e29da08c..1a1b4dab5ae40a257ccbffcbb8a811d3bdf86273 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -1,13 +1,3 @@
-# London, GB
-# BW Limit: 1000Mb/s
-london:
-  lat: 51.507222
-  lon: -0.1275
-  pingdom: 546503
-  colour: "#bf3030"
-  bandwidth: 60
-  default: true
-

 # Sjöbo, SE
 # BW Limit: 1000Mb/s
 sjobo:
 # Sjöbo, SE
 # BW Limit: 1000Mb/s
 sjobo:


@@ -16,6 +6,8 @@ sjobo:
   pingdom: 546505
   colour: "#bfa730"
   bandwidth: 90
   pingdom: 546505
   colour: "#bfa730"
   bandwidth: 90

+  ipv4: 85.30.190.241
+  ipv6: 2a02008000003ff8022264fffe2a2714

 
 # Moscow, RU
 # BW Limit: 1000Mb/s
 
 # Moscow, RU
 # BW Limit: 1000Mb/s


@@ -24,7 +16,8 @@ moscow:
   lon: 37.617
   pingdom: 659912
   colour: "#412c84"
   lon: 37.617
   pingdom: 659912
   colour: "#412c84"

-  bandwidth: 55
+  bandwidth: 60
+  ipv4: 130.193.62.73

   allowed:
     countries:
       - AZ
   allowed:
     countries:
       - AZ


@@ -50,6 +43,8 @@ brisbane:
   pingdom: 657940
   colour: "#269926"
   bandwidth: 20
   pingdom: 657940
   colour: "#269926"
   bandwidth: 20

+  ipv4: 203.26.72.12
+  ipv6: 2402640000010006021708fffe5640c3

   allowed:
     continents:
       - OC
   allowed:
     continents:
       - OC


@@ -62,6 +57,7 @@ pau:
   pingdom: 718192
   colour: "#bf8230"
   bandwidth: 60
   pingdom: 718192
   colour: "#bf8230"
   bandwidth: 60

+  ipv4: 193.55.222.229

   allowed:
     continents:
       - EU
   allowed:
     continents:
       - EU


@@ -73,7 +69,12 @@ amsterdam:
   lon: 4.89222
   pingdom: 766251
   colour: "#a1b92e"
   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
 
 # Oslo, NO
 # BW Limit: 1000Mb/s


@@ -83,6 +84,7 @@ oslo:
   pingdom: 769267
   colour: "#7c1f7c"
   bandwidth: 30
   pingdom: 769267
   colour: "#7c1f7c"
   bandwidth: 30

+  ipv4: 31.169.50.10

   allowed:
     continents:
       - EU
   allowed:
     continents:
       - EU


@@ -95,6 +97,10 @@ sanfrancisco:
   pingdom: 788480
   colour: "#25567b"
   bandwidth: 22
   pingdom: 788480
   colour: "#25567b"
   bandwidth: 22

+  ipv4: 64.62.205.202
+  preferred:
+    countries:
+      - CN

 
 # Lyon, FR
 # BW Limit: 100Mb/s
 
 # Lyon, FR
 # BW Limit: 100Mb/s


@@ -103,26 +109,82 @@ lyon:
   lon: 4.8323239
   pingdom: 789594
   colour: "#bf6530"
   lon: 4.8323239
   pingdom: 789594
   colour: "#bf6530"

-  bandwidth: 30
+  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
+  default: "xx"
+  allowed:
+    continents:
+      - EU

 
 

-# Beauharnois, CA
-beauharnois:
-  lat: 45.308402
-  lon: -73.893557
-  pingdom: 824231
+# Provo, US
+provo:
+  lat: 40.20686
+  lon: -111.642765
+  colour: "#1f7c65"
+  default: "xx"
+  servers:
+    - pingdom: 909444
+      bandwidth: 20
+      ipv4: 192.163.219.36
+    - pingdom: 909445
+      bandwidth: 20
+      ipv4: 192.163.219.40
+
+# Baku, AZ
+baku:
+  lat: 40.395278
+  lon: 49.882222

   colour: "#bfb830"
   colour: "#bfb830"

-  bandwidth: 50
+  pingdom: 1064415
+  bandwidth: 45
+  ipv4: 94.20.20.55
+  allowed:
+    continents:
+      - AS
+      - EU
+  preferred:
+    countries:
+      - AZ
+  denied:
+    countries:
+      - CN
+      - JP
+      - KR
+      - VN

 
 

-# Nuremberg, DE
-nuremberg:
-  lat: 49.45
-  lon: 11.083333
-  colour: "#562781"
-  bandwidth: 0
+# Hsinchu, TW
+hsinchu:
+  lat: 24.78268
+  lon: 120.99563
+  colour: "#bf3030"
+  pingdom: 1124306
+  bandwidth: 30
+  ipv4: 140.110.240.7
+  ipv6: 20010e10200002400000000000000007
+  allowed:
+    continents:
+      - AS
+  preferred:
+    countries:
+      - TW
+      - JP

 
 # Spare colours:
 #
 
 # Spare colours:
 #

-#  1f7c65 

 #  bf9430
 #  7ab02c
 #  a1285f
 #  bf9430
 #  7ab02c
 #  a1285f