Add jq and less to docker

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index 6507dce5e05c9661490ff304c3f0374963e01919..94daf1ce2ac993736e85d634ffc6626c8af7293a 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -150,8 +150,8 @@ germany:
       ipv4: 195.201.226.63
       ipv6: 2a0104f81c1cbc540000000000000001
   allowed:
-    continents:
-      - EU
+    countries:
+      - DE
 
 # Baku, AZ
 # BW Limit: 1000Mb/s
@@ -197,9 +197,6 @@ hsinchu:
     countries:
       - TW
       - JP
-  denied:
-    countries:
-      - ID
 
 # Pula, HR
 pula:
@@ -209,7 +206,7 @@ pula:
     - 2217279
     - 2217280
   colour: "#a6cee3"
-  bandwidth: 80
+  bandwidth: 120
   ipv4: 193.198.233.211
   ipv6: 20010b684cff00030000000000000003
   default: "xx"
@@ -414,23 +411,85 @@ wellington:
     - 3911508
     - 3911509
   colour: "#ffff99"
-  bandwidth: 40
-  ipv4: 103.106.66.202
+  bandwidth: 80
+  ipv4: 114.23.141.203
   allowed:
+    continents:
+      - OC
     countries:
-      - AU
       - CC
-      - HM
-      - NC
-      - NF
-      - NZ
   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
+  allowed:
+    continents:
+      - OC
     countries:
-      - AU
       - CC
-      - HM
-      - NF
-      - NZ
+  preferred:
+    continents:
+      - OC
+    countries:
+      - CC
+
+# 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
+      ipv4: 130.236.254.221
+      ipv6: 200106b00017f0a000000000000000dd
+    - statuscake:
+        - 3949588
+        - 3949589
+      bandwidth: 40
+      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