Merge tuatara and waima into a single virtual cache

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 64217e685be23eb35ed0707e1302322b6772cca9..3234e3a1ef1763bf131f157297dbd5961f2d2d61 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -84,31 +84,36 @@ france:
         - 2217265
         - 2217266
       bandwidth: 100
+      name: nepomuk
       ipv4: 77.95.65.39
       ipv6: 2a039180000001000000000000000007
     - statuscake:
         - 3351567
         - 3351569
       bandwidth: 100
+      name: noomoahk
       ipv4: 91.224.148.166
       ipv6: 2a0372208080a6000000000000000001
     - statuscake:
         - 3743694
         - 3743696
-      bandwidth: 100
+      bandwidth: 60
+      name: norbert
       ipv4: 89.234.186.100
       ipv6: 2a005884821c00000000000000000001
     - statuscake:
         - 3750719
         - 3750717
-      bandwidth: 100
+      bandwidth: 40
+      name: necrosan
       ipv4: 80.67.167.77
       ipv6: 2a0bcbc0110d0001000000000000001c
     - statuscake:
-        - 3794330
-        - 3794331
-      bandwidth: 100
-      ipv4: 185.216.27.232
+        - 5321339
+        - 5321340
+      bandwidth: 150
+      name: naga
+      ipv4: 185.116.130.151
   preferred:
     countries:
       - FR
@@ -128,30 +133,34 @@ germany:
     - statuscake:
         - 2217269
         - 2217270
-      bandwidth: 150
+      bandwidth: 80
+      name: katie
       ipv4: 144.76.70.77
       ipv6: 2a0104f80191834c0000000000000002
     - statuscake:
         - 2217271
         - 2217272
-      bandwidth: 150
+      bandwidth: 80
+      name: konqi
       ipv4: 81.7.11.83
       ipv6: 2a020180000100010000000005170b53
     - statuscake:
         - 2217293
         - 2217294
-      bandwidth: 150
+      bandwidth: 80
+      name: kalessin
       ipv4: 185.66.195.245
       ipv6: 2a032260200000010000000000000005
     - statuscake:
         - 3750847
         - 3750842
-      bandwidth: 150
+      bandwidth: 120
+      name: keizer
       ipv4: 195.201.226.63
       ipv6: 2a0104f81c1cbc540000000000000001
   allowed:
-    continents:
-      - EU
+    countries:
+      - DE
 
 # Baku, AZ
 # BW Limit: 1000Mb/s
@@ -193,13 +202,13 @@ hsinchu:
   allowed:
     continents:
       - AS
+  denied:
+    countries:
+      - ID
   preferred:
     countries:
       - TW
       - JP
-  denied:
-    countries:
-      - ID
 
 # Pula, HR
 pula:
@@ -209,7 +218,7 @@ pula:
     - 2217279
     - 2217280
   colour: "#a6cee3"
-  bandwidth: 80
+  bandwidth: 120
   ipv4: 193.198.233.211
   ipv6: 20010b684cff00030000000000000003
   default: "xx"
@@ -231,14 +240,22 @@ osijek:
 london:
   lat: 51.5120484
   lon: -0.00201880060605929
-  pingdom: 1453871
-  statuscake:
-   - 2214077
-   - 2217246
   colour: "#ffed6f"
-  bandwidth: 200
-  ipv4: 185.73.44.30
-  ipv6: 20010ba800002c1e0000000000000000
+  servers:
+    - statuscake:
+       - 2214077
+       - 2217246
+      bandwidth: 150
+      name: saphira
+      ipv4: 185.73.44.30
+      ipv6: 20010ba800002c1e0000000000000000
+    - statuscake:
+       - 4089249
+       - 4089250
+      bandwidth: 150
+      name: toothless
+      ipv4: 185.73.44.167
+      ipv6: 20010ba800002ca70000000000000000
   preferred:
     countries:
       - GB
@@ -406,33 +423,108 @@ kiev:
   ipv4: 176.122.99.101
   ipv6: 2001067c2d4000000000000000000065
 
-# Wellington, NZ
-wellington:
-  lat: -41.288889
-  lon: 174.777222
-  statuscake:
-    - 3911508
-    - 3911509
+# Hamilton/Wellington, NZ
+# Hamilton @ -37.783333,175.283333
+# Wellington @ -41.288889,174.777222
+newzealand:
+  lat: -39.536111
+  lon: 175.0302775
   colour: "#ffff99"
-  bandwidth: 40
-  ipv4: 103.106.66.202
+  servers:
+    - statuscake:
+        - 3911508
+        - 3911509
+      bandwidth: 10
+      name: tuatara
+      ipv4: 114.23.141.203
+      ipv6: 24061e00b4100c24529a4cfffe79bc3b
+    - statuscake:
+        - 3931336
+        - 3931337
+      bandwidth: 40
+      name: waima
+      ipv4: 103.197.61.160
+  allowed:
+    continents:
+      - OC
+    countries:
+      - CC
+  preferred:
+    continents:
+      - OC
+    countries:
+      - CC
+
+# Melbourne, AU
+melbourne:
+  lat: -37.8004228
+  lon: 144.9684343
+  statuscake:
+    - 5043902
+    - 5043903
+  colour: "#999999"
+  bandwidth: 80
+  ipv4: 138.44.68.134
   allowed:
+    continents:
+      - OC
     countries:
-      - AU
       - CC
-      - CX
-      - HM
-      - NC
-      - NF
-      - NZ
+      - ID
   preferred:
+    continents:
+      - OC
     countries:
-      - AU
       - CC
-      - CX
-      - HM
-      - NF
-      - NZ
+      - ID
+
+# Linköping/Umeå, SE
+# Linköping @ 58.403261,15.623611189797
+# Umeå @ 63.82177625,20.3043163114932
+sweden:
+  lat: 61.1125186
+  lon: 17.9639637506451
+  colour: "#d9d9d9"
+  servers:
+    - statuscake:
+        - 3932686
+        - 3932688
+      bandwidth: 40
+      name: nidhogg
+      ipv4: 130.236.254.221
+      ipv6: 200106b00017f0a000000000000000dd
+    - statuscake:
+        - 3949588
+        - 3949589
+      bandwidth: 80
+      name: fafnir
+      ipv4: 130.239.18.114
+      ipv6: 200106b0000e2a180000000000000114
+
+# Curitiba, BR
+curitiba:
+  lat: -25.41403745
+  lon: -49.252918753851
+  statuscake:
+    - 3945882
+    - 3945883
+  colour: "#d9d9d9"
+  bandwidth: 80
+  ipv4: 200.236.31.207
+  ipv6: 2801008280ff80020216ccfffeaa0021
+  allowed:
+    countries:
+      - BR
+
+# Pilsen, CZ
+pilsen:
+  lat: 49.723689
+  lon: 13.351542
+  statuscake:
+    - 4065539
+    - 4065540
+  colour: "#d9d9d9"
+  bandwidth: 30
+  ipv4: 147.228.60.16
 
 # Spare colours:
-# #999999, #d9d9d9