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 be26a59e66a87560a3092a2327fa8a5ce2b7119d..4fa26ae33d91245a688dae74e6e7409dfbced042 100644 (file)
--- a/src/tile.openstreetmap
+++ b/src/tile.openstreetmap
@@ -31,15 +31,15 @@ moscow:
 
 # Amsterdam, NL
 # BW Limit: 1000Mb/s
-# amsterdam:
-#   lat: 52.37306
-#   lon: 4.89222
-#   statuscake:
-#     - 2217259
-#     - 2217260
-#   colour: "#bebada"
-#   bandwidth: 100
-#   ipv4: 134.90.146.26
+amsterdam:
+  lat: 52.37306
+  lon: 4.89222
+  statuscake:
+    - 2217259
+    - 2217260
+  colour: "#bebada"
+  bandwidth: 100
+  ipv4: 134.90.146.26
 
 # Oslo, NO
 # BW Limit: 1000Mb/s
@@ -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
@@ -237,28 +240,37 @@ london:
       ipv4: 185.73.44.30
       ipv6: 20010ba800002c1e0000000000000000
     - statuscake:
-        - 2217259
-        - 2217260
-      colour: "#bebada"
-      bandwidth: 100
-      ipv4: 134.90.146.26
-  allowed:
+       - 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
@@ -418,7 +430,7 @@ wellington:
     - 3911509
   colour: "#ffff99"
   bandwidth: 80
-  ipv4: 103.106.66.202
+  ipv4: 114.23.141.203
   allowed:
     continents:
       - OC
@@ -451,6 +463,29 @@ hamilton:
     countries:
       - CC
 
+# Melbourne, AU
+melbourne:
+  lat: -37.8004228
+  lon: 144.9684343
+  statuscake:
+    - 5043902
+    - 5043903
+  colour: "#d9d9d9"
+  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
@@ -487,4 +522,15 @@ curitiba:
     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: