Update IPV6 address for konqi

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index db89eda3137364f14f01c6bc29f1ba4032f132ce..5282086a8d4ccb1c4504143ab96206dd3cb064fd 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -16,7 +16,7 @@ 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:
   ipv4: 130.193.62.73
   allowed:
     countries:


@@ -35,20 +35,6 @@ moscow:
     countries:
       - RU
 
     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:
 # Pau, FR
 # Limit 100Mb/s
 pau:


@@ -69,9 +55,12 @@ amsterdam:
   lon: 4.89222
   pingdom: 766251
   colour: "#a1b92e"
   lon: 4.89222
   pingdom: 766251
   colour: "#a1b92e"

-  bandwidth: 50
+  bandwidth: 40

   ipv4: 134.90.146.26
   ipv4: 134.90.146.26

-  default: true
+  default: "xx"
+  preferred:
+    countries:
+      - ZA

 
 # Oslo, NO
 # BW Limit: 1000Mb/s
 
 # Oslo, NO
 # BW Limit: 1000Mb/s


@@ -82,9 +71,7 @@ oslo:
   colour: "#7c1f7c"
   bandwidth: 30
   ipv4: 31.169.50.10
   colour: "#7c1f7c"
   bandwidth: 30
   ipv4: 31.169.50.10

-  allowed:
-    continents:
-      - EU
+  default: "xx"

 
 # San Francisco, US
 # BW Limit: 100Mb/s ?
 
 # San Francisco, US
 # BW Limit: 100Mb/s ?


@@ -95,6 +82,9 @@ sanfrancisco:
   colour: "#25567b"
   bandwidth: 22
   ipv4: 64.62.205.202
   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,29 +93,29 @@ lyon:
   lon: 4.8323239
   pingdom: 789594
   colour: "#bf6530"
   lon: 4.8323239
   pingdom: 789594
   colour: "#bf6530"

-  bandwidth: 30
+  bandwidth: 35

   ipv4: 77.95.70.166
   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

 
 

-# Falkenstein, DE
-falkenstein:
-  lat: 50.4782198
-  lon: 12.3361987876257
-  pingdom: 834186
+# Falkenstein/Jena, DE
+germany:
+  lat: 50.703515
+  lon: 11.96044

   colour: "#562781"
   colour: "#562781"

-  bandwidth: 50
-  ipv4: 5.9.150.236
-  ipv6: 2a0104f8019033eb0000000000000002
+  servers:
+    - pingdom: 834186
+      bandwidth: 40
+      ipv4: 5.9.150.236
+      ipv6: 2a0104f8019033eb0000000000000002
+    - pingdom: 1483284
+      bandwidth: 40
+      ipv4: 144.76.70.77
+      ipv6: 2a0104f80191834c0000000000000002
+    - pingdom: 1486872
+      bandwidth: 40
+      ipv4: 81.7.11.83
+      ipv6: 2a020180000100010000000005170ad5
+  default: "xx"

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


@@ -137,16 +127,92 @@ provo:
   colour: "#1f7c65"
   servers:
     - pingdom: 909444
   colour: "#1f7c65"
   servers:
     - pingdom: 909444

-      bandwidth: 10
+      bandwidth: 15.2261

       ipv4: 192.163.219.36
     - pingdom: 909445
       ipv4: 192.163.219.36
     - pingdom: 909445

-      bandwidth: 10
+      bandwidth: 15.2261

       ipv4: 192.163.219.40
       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: 45
+  ipv4: 94.20.20.55
+  allowed:
+    continents:
+      - AS
+      - EU
+  preferred:
+    countries:
+      - AZ
+  denied:
+    countries:
+      - AM
+      - CN
+      - JP
+      - KR
+      - VN
+
+# Hsinchu, TW
+hsinchu:
+  lat: 24.78268
+  lon: 120.99563
+  colour: "#bf3030"
+  pingdom: 1124306
+  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:
 #
 
 # Spare colours:
 #

-#  bf3030
-#  bf9430
-#  7ab02c
-#  a1285f

 #  2c3d82
 #  2c3d82

+#  269926