Revert "Prefer fastly for Canada"

[dns.git] / src / tile.openstreetmap.yml

diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml
index 83d941e54d01fe7d0eccc14d1cb5a6eb1f6ee936..873bd094d47263e8aad220fe731c0658988995a5 100644 (file)
--- a/src/tile.openstreetmap.yml
+++ b/src/tile.openstreetmap.yml
@@ -42,7 +42,7 @@ netherlands:
     - statuscake:
         - 2217259
         - 2217260
     - statuscake:
         - 2217259
         - 2217260

-      bandwidth: 60
+      bandwidth: 30

       name: trogdor
       ipv4: 134.90.146.26
     - statuscake:
       name: trogdor
       ipv4: 134.90.146.26
     - statuscake:


@@ -71,7 +71,6 @@ oslo:
   colour: "#ffffb3"
   bandwidth: 30
   ipv4: 31.169.50.10
   colour: "#ffffb3"
   bandwidth: 30
   ipv4: 31.169.50.10

-  default: "xx"

 
 # San Francisco, US
 # BW Limit: 100Mb/s ?
 
 # San Francisco, US
 # BW Limit: 100Mb/s ?


@@ -82,7 +81,7 @@ sanfrancisco:
     - 2217263
     - 2217264
   colour: "#e31a1c"
     - 2217263
     - 2217264
   colour: "#e31a1c"

-  bandwidth: 60
+  bandwidth: 30

   ipv4: 71.19.155.177
   ipv6: 2605:2700:0:17:a800:ff:fe3e:cdca
   preferred:
   ipv4: 71.19.155.177
   ipv6: 2605:2700:0:17:a800:ff:fe3e:cdca
   preferred:


@@ -120,13 +119,6 @@ france:
       name: norbert
       ipv4: 89.234.186.100
       ipv6: 2a00:5884:821c::1
       name: norbert
       ipv4: 89.234.186.100
       ipv6: 2a00:5884:821c::1

-    - statuscake:
-        - 3750719
-        - 3750717
-      bandwidth: 20
-      name: necrosan
-      ipv4: 80.67.167.77
-      ipv6: 2a0b:cbc0:110d:1::1c

     - statuscake:
         - 5321339
         - 5321340
     - statuscake:
         - 5321339
         - 5321340


@@ -147,6 +139,13 @@ france:
       name: meraxes
       ipv4: 51.15.185.90
       ipv6: 2001:bc8:2d57:100:aa1e:84ff:fe72:e660
       name: meraxes
       ipv4: 51.15.185.90
       ipv6: 2001:bc8:2d57:100:aa1e:84ff:fe72:e660

+    - statuscake:
+        - 5590997
+        - 5590998
+      bandwidth: 60
+      name: lockheed
+      ipv4: 176.9.171.103
+      ipv6: 2a01:4f8:13a:209::103

   preferred:
     countries:
       - FR
   preferred:
     countries:
       - FR


@@ -197,6 +196,13 @@ germany:
       bandwidth: 60
       name: kokosnuss
       ipv4: 85.214.255.86
       bandwidth: 60
       name: kokosnuss
       ipv4: 85.214.255.86

+    - statuscake:
+        - 5590100
+        - 5590099
+      bandwidth: 60
+      name: kilgharrah
+      ipv4: 176.9.47.143
+      ipv6: 2a01:4f8:150:638d::2

     - statuscake:
         - 5457454
         - 5457453
     - statuscake:
         - 5457454
         - 5457453


@@ -204,6 +210,13 @@ germany:
       name: gackelchen
       ipv4: 46.226.108.71
       ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c
       name: gackelchen
       ipv4: 46.226.108.71
       ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c

+    - statuscake:
+        - 5648863
+        - 5648862
+      bandwidth: 120
+      name: lambton
+      ipv4: 88.99.244.109
+      ipv6: 2a01:4f8:10b:492::2

   allowed:
     countries:
       - DE
   allowed:
     countries:
       - DE


@@ -267,7 +280,6 @@ pula:
   bandwidth: 100
   ipv4: 193.198.233.211
   ipv6: 2001:b68:4cff:3::3
   bandwidth: 100
   ipv4: 193.198.233.211
   ipv6: 2001:b68:4cff:3::3

-  default: "xx"

 
 # Osijek, HR
 osijek:
 
 # Osijek, HR
 osijek:


@@ -280,7 +292,6 @@ osijek:
   bandwidth: 100
   ipv4: 161.53.30.107
   ipv6: 2001:b68:c0ff:0:221:5eff:fe40:c7c4
   bandwidth: 100
   ipv4: 161.53.30.107
   ipv6: 2001:b68:c0ff:0:221:5eff:fe40:c7c4

-  default: "xx"

 
 # London, GB
 london:
 
 # London, GB
 london:


@@ -294,14 +305,15 @@ london:
       bandwidth: 150
       name: saphira
       ipv4: 185.73.44.30
       bandwidth: 150
       name: saphira
       ipv4: 185.73.44.30

-      ipv6: 2001:ba8:0:2c1e::
+      ipv6: 2001:ba8:0:2c1e::0

     - statuscake:
        - 4089249
        - 4089250
       bandwidth: 150
       name: toothless
       ipv4: 185.73.44.167
     - statuscake:
        - 4089249
        - 4089250
       bandwidth: 150
       name: toothless
       ipv4: 185.73.44.167

-      ipv6: 2001:ba8:0:2ca7::
+      ipv6: 2001:ba8:0:2ca7::0
+  default: "xx"

   preferred:
     countries:
       - GB
   preferred:
     countries:
       - GB


@@ -318,16 +330,16 @@ corvallis:
        - 5434496
        - 5434497
       bandwidth: 200
        - 5434496
        - 5434497
       bandwidth: 200

-      name: stormfly-01
-      ipv4: 140.211.167.104
-      ipv6: 2605:bc80:3010:700::8cde:a768
+      name: stormfly-03
+      ipv4: 140.211.167.99
+      ipv6: 2605:bc80:3010:700::8cd3:a763

     - statuscake:
        - 2217287
     - statuscake:
        - 2217287

-       - 2217288
+       - 5560091

       bandwidth: 200
       bandwidth: 200

-      name: stormfly-02
-      ipv4: 140.211.167.105
-      ipv6: 2605:bc80:3010:700::8cde:a769
+      name: stormfly-04
+      ipv4: 140.211.167.100
+      ipv6: 2605:bc80:3010:700::8cd3:a764

   preferred:
     countries:
       - US
   preferred:
     countries:
       - US


@@ -674,4 +686,27 @@ buenosaires:
 #  ipv4: 46.226.108.71
 #  ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c
 
 #  ipv4: 46.226.108.71
 #  ipv6: 2001:4b98:dc2:41:216:3eff:fe62:924c
 

+# Fastly
+fastly:
+  global: true
+  statuscake:
+    - 5679197
+    - 5679198
+  bandwidth: 1000
+  cname: cdn-fastly-test.tile.openstreetmap.org
+  allowed:
+    countries:
+      - CA
+      - MX
+      - US
+      - CA
+      - MX
+  preferred:
+    countries:
+      - CA
+      - MX
+      - US
+      - CA
+      - MX
+

 # Spare colours:
 # Spare colours: