SPF: Remove old IPs. Add MX. Switch to Hard fail

[dns.git] / src / tile.openstreetmap

diff --git a/src/tile.openstreetmap b/src/tile.openstreetmap
index a4150af41ad0080eb65b1974a91c4b5a2d5877d4..4fa26ae33d91245a688dae74e6e7409dfbced042 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
@@ -193,6 +193,9 @@ hsinchu:
   allowed:
     continents:
       - AS
+  denied:
+    countries:
+      - ID
   preferred:
     countries:
       - TW
@@ -206,7 +209,7 @@ pula:
     - 2217279
     - 2217280
   colour: "#a6cee3"
-  bandwidth: 80
+  bandwidth: 120
   ipv4: 193.198.233.211
   ipv6: 20010b684cff00030000000000000003
   default: "xx"
@@ -228,31 +231,46 @@ 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
+      ipv4: 185.73.44.30
+      ipv6: 20010ba800002c1e0000000000000000
+    - statuscake:
+       - 4089249
+       - 4089250
+      bandwidth: 150
+      ipv4: 185.73.44.167
+      ipv6: 20010ba800002ca70000000000000000
   preferred:
     countries:
       - GB
       - IE
       - IM
 
-# Corvallis, US
-corvallis:
-  lat: 44.5639267
-  lon: -123.274707837676
-  statuscake:
-    - 2217287
-    - 2217288
+# Corvallis/Pittsburgh, US
+# Corvallis @ 44.5639267,-123.274707837676
+# Pittsburgh @ 40.4474127,-80.0078641
+usa:
+  lat: 42.5056697
+  lon: -101.641285968838
   colour: "#6a3d9a"
-  bandwidth: 200
-  ipv4: 140.211.167.105
-  ipv6: 2605bc8030100700000000008cdea769
+  servers:
+    - statuscake:
+       - 2217287
+       - 2217288
+      bandwidth: 200
+      ipv4: 140.211.167.105
+      ipv6: 2605bc8030100700000000008cdea769
+    - statuscake:
+       - 4112776
+       - 4112775
+      bandwidth: 200
+      ipv4: 204.16.246.252
+      ipv6: 2607fdc0000100000000000000000052
   preferred:
     countries:
       - US
@@ -412,7 +430,7 @@ wellington:
     - 3911509
   colour: "#ffff99"
   bandwidth: 80
-  ipv4: 103.106.66.202
+  ipv4: 114.23.141.203
   allowed:
     continents:
       - OC
@@ -445,16 +463,74 @@ hamilton:
     countries:
       - CC
 
-# Linköping, Sweden
-linkoping:
-  lat: 58.403261
-  lon: 15.623611189797
+# Melbourne, AU
+melbourne:
+  lat: -37.8004228
+  lon: 144.9684343
   statuscake:
-    - 3932686
-    - 3932688
+    - 5043902
+    - 5043903
   colour: "#d9d9d9"
-  bandwidth: 40
-  ipv4: 130.236.254.221
-  ipv6: 200106b00017f0a000000000000000dd
+  bandwidth: 80
+  ipv4: 138.44.68.134
+  allowed:
+    continents:
+      - OC
+    countries:
+      - CC
+      - ID
+  preferred:
+    continents:
+      - OC
+    countries:
+      - CC
+      - 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
+      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: