Update log analysis script to use Maxmind GeoIP data

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 90c36633871cf4076feaad5a815e4a80e29da08c..9ed577f7d03ced0ac8ddad6e76ef0e90d3b3ce72 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


@@ -42,18 +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
-  allowed:
-    continents:
-      - OC
-

 # Pau, FR
 # Limit 100Mb/s
 pau:
 # Pau, FR
 # Limit 100Mb/s
 pau:


@@ -62,6 +43,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 +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
+  default: "xx"
+  preferred:
+    countries:
+      - ZA

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


@@ -83,9 +70,8 @@ oslo:
   pingdom: 769267
   colour: "#7c1f7c"
   bandwidth: 30
   pingdom: 769267
   colour: "#7c1f7c"
   bandwidth: 30

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

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


@@ -95,6 +81,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,27 +93,122 @@ 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
+
+# Falkenstein, DE
+falkenstein:
+  lat: 50.4782198
+  lon: 12.3361987876257
+  colour: "#562781"
+  servers:
+    - pingdom: 834186
+      bandwidth: 40
+      ipv4: 5.9.150.236
+      ipv6: 2a0104f8019033eb0000000000000002
+    - pingdom: 1483284
+      bandwidth: 40
+      ipv4: 144.76.70.77
+      ipv6: 2a0104f80191834c0000000000000002
+  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"
+  servers:
+    - pingdom: 909444
+      bandwidth: 15.2261
+      ipv4: 192.163.219.36
+    - pingdom: 909445
+      bandwidth: 15.2261
+      ipv4: 192.163.219.40
+  allowed:
+    continents:
+      - NA
+      - SA
+
+# Baku, AZ
+# BW Limit: 1000Mb/s
+baku:
+  lat: 40.395278
+  lon: 49.882222

   colour: "#bfb830"
   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
   bandwidth: 50

+  ipv4: 185.73.44.30
+  ipv6: 20010ba800002c1e0000000000000000

 
 

-# Nuremberg, DE
-nuremberg:
-  lat: 49.45
-  lon: 11.083333
-  colour: "#562781"
-  bandwidth: 0
+# 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:
 #

-#  1f7c65 
-#  bf9430
-#  7ab02c
-#  a1285f

 #  2c3d82
 #  2c3d82

+#  269926