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 739263930bfdc58bdc6f46f6cbbb8adfc9942f67..3234e3a1ef1763bf131f157297dbd5961f2d2d61 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -84,30 +84,35 @@ 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: 60
+      name: norbert
       ipv4: 89.234.186.100
       ipv6: 2a005884821c00000000000000000001
     - statuscake:
         - 3750719
         - 3750717
       bandwidth: 40
+      name: necrosan
       ipv4: 80.67.167.77
       ipv6: 2a0bcbc0110d0001000000000000001c
     - statuscake:
         - 5321339
         - 5321340
       bandwidth: 150
+      name: naga
       ipv4: 185.116.130.151
   preferred:
     countries:
@@ -128,25 +133,29 @@ 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:
@@ -237,12 +246,14 @@ london:
        - 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:
@@ -412,37 +423,27 @@ 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: 80
-  ipv4: 114.23.141.203
-  allowed:
-    continents:
-      - OC
-    countries:
-      - CC
-  preferred:
-    continents:
-      - OC
-    countries:
-      - CC
-
-# Hamilton, NZ
-hamilton:
-  lat: -37.783333
-  lon: 175.283333
-  statuscake:
-    - 3931336
-    - 3931337
-  colour: "#999999"
-  bandwidth: 80
-  ipv4: 103.197.61.160
+  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
@@ -461,7 +462,7 @@ melbourne:
   statuscake:
     - 5043902
     - 5043903
-  colour: "#d9d9d9"
+  colour: "#999999"
   bandwidth: 80
   ipv4: 138.44.68.134
   allowed:
@@ -489,12 +490,14 @@ sweden:
         - 3932686
         - 3932688
       bandwidth: 40
+      name: nidhogg
       ipv4: 130.236.254.221
       ipv6: 200106b00017f0a000000000000000dd
     - statuscake:
         - 3949588
         - 3949589
-      bandwidth: 40
+      bandwidth: 80
+      name: fafnir
       ipv4: 130.239.18.114
       ipv6: 200106b0000e2a180000000000000114