From e947590c6a42789d8a1c240331d85ca637274ed4 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 9 Nov 2019 15:00:33 +0000 Subject: [PATCH] Remove sibling lists for tile caches --- roles/angor.rb | 8 +------- roles/ascalon.rb | 6 +----- roles/balerion.rb | 7 +------ roles/boitata.rb | 8 +------- roles/cherufe.rb | 8 +------- roles/chrysophylax.rb | 7 +------ roles/cmok.rb | 8 +------- roles/culebre.rb | 8 +------- roles/drogon.rb | 5 +---- roles/fafnir.rb | 8 +------- roles/fume.rb | 8 +------- roles/gorynych.rb | 6 +----- roles/jakelong.rb | 8 +------- roles/kalessin.rb | 7 +------ roles/katie.rb | 6 +----- roles/keizer.rb | 6 +----- roles/konqi.rb | 9 +-------- roles/ladon.rb | 9 +-------- roles/longma.rb | 7 +------ roles/necrosan.rb | 10 +--------- roles/nepomuk.rb | 10 +--------- roles/nidhogg.rb | 8 +------- roles/noomoahk.rb | 10 +--------- roles/norbert.rb | 6 +----- roles/ridgeback.rb | 9 +-------- roles/rimfaxe.rb | 8 +------- roles/saphira.rb | 10 +--------- roles/sarkany.rb | 8 +------- roles/simurgh.rb | 7 +------ roles/stormfly-02.rb | 3 +-- roles/toothless.rb | 10 +--------- roles/trogdor.rb | 9 +-------- roles/tuatara.rb | 7 +------ roles/vipertooth.rb | 8 +------- roles/viserion.rb | 5 +---- roles/waima.rb | 7 +------ 36 files changed, 36 insertions(+), 238 deletions(-) diff --git a/roles/angor.rb b/roles/angor.rb index e29127eed..12ebea0d5 100644 --- a/roles/angor.rb +++ b/roles/angor.rb @@ -36,13 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "capetown.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "capetown.render.openstreetmap.org" } ) diff --git a/roles/ascalon.rb b/roles/ascalon.rb index bbde4f2e2..ea377fb5b 100644 --- a/roles/ascalon.rb +++ b/roles/ascalon.rb @@ -28,11 +28,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "montreal.render.openstreetmap.org", - :tile_siblings => [ - "stormfly-02.openstreetmap.org", - "jakelong.openstreetmap.org" - ] + :tile_parent => "montreal.render.openstreetmap.org" } ) diff --git a/roles/balerion.rb b/roles/balerion.rb index 007ecda96..e6695a4c9 100644 --- a/roles/balerion.rb +++ b/roles/balerion.rb @@ -31,12 +31,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "melbourne.render.openstreetmap.org", - :tile_siblings => [ - "waima.openstreetmap.org", - "tuatara.openstreetmap.org", - "longma.openstreetmap.org" - ] + :tile_parent => "melbourne.render.openstreetmap.org" } ) diff --git a/roles/boitata.rb b/roles/boitata.rb index 1e7b99a34..82cc3399e 100644 --- a/roles/boitata.rb +++ b/roles/boitata.rb @@ -36,13 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "curitiba.render.openstreetmap.org", - :tile_siblings => [ - "cherufe.openstreetmap.org", - "ascalon.openstreetmap.org", - "stormfly-02.openstreetmap.org", - "jakelong.openstreetmap.org" - ] + :tile_parent => "curitiba.render.openstreetmap.org" } ) diff --git a/roles/cherufe.rb b/roles/cherufe.rb index 30814b8a7..87f6da6f8 100644 --- a/roles/cherufe.rb +++ b/roles/cherufe.rb @@ -38,13 +38,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "vinadelmar.render.openstreetmap.org", - :tile_siblings => [ - "boitata.openstreetmap.org", - "ascalon.openstreetmap.org", - "stormfly-02.openstreetmap.org", - "jakelong.openstreetmap.org" - ] + :tile_parent => "vinadelmar.render.openstreetmap.org" } ) diff --git a/roles/chrysophylax.rb b/roles/chrysophylax.rb index db509a876..93c6b21a9 100644 --- a/roles/chrysophylax.rb +++ b/roles/chrysophylax.rb @@ -36,12 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "zurich.render.openstreetmap.org", - :tile_siblings => [ - "noomoahk.openstreetmap.org", - "ladon.openstreetmap.org", - "culebre.openstreetmap.org" - ] + :tile_parent => "zurich.render.openstreetmap.org" } ) diff --git a/roles/cmok.rb b/roles/cmok.rb index eb841fd2b..41de78a53 100644 --- a/roles/cmok.rb +++ b/roles/cmok.rb @@ -36,13 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "minsk.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "minsk.render.openstreetmap.org" } ) diff --git a/roles/culebre.rb b/roles/culebre.rb index c50f00588..442009794 100644 --- a/roles/culebre.rb +++ b/roles/culebre.rb @@ -35,13 +35,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "zaragoza.render.openstreetmap.org", - :tile_siblings => [ - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "zaragoza.render.openstreetmap.org" } ) diff --git a/roles/drogon.rb b/roles/drogon.rb index 03f4784ba..1938270f9 100644 --- a/roles/drogon.rb +++ b/roles/drogon.rb @@ -46,10 +46,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "osijek.render.openstreetmap.org", - :tile_siblings => [ - "viserion.openstreetmap.org" - ] + :tile_parent => "osijek.render.openstreetmap.org" } ) diff --git a/roles/fafnir.rb b/roles/fafnir.rb index 29d3e9b0b..c526226a8 100644 --- a/roles/fafnir.rb +++ b/roles/fafnir.rb @@ -36,13 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "sweden.render.openstreetmap.org", - :tile_siblings => [ - "nidhogg.openstreetmap.org", - "ridgeback.openstreetmap.org", - "rimfaxe.openstreetmap.org", - "trogdor.openstreetmap.org" - ] + :tile_parent => "sweden.render.openstreetmap.org" } ) diff --git a/roles/fume.rb b/roles/fume.rb index e82720597..176a22d61 100644 --- a/roles/fume.rb +++ b/roles/fume.rb @@ -28,13 +28,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "pilsen.render.openstreetmap.org", - :tile_siblings => [ - "sarkany.openstreetmap.org", - "chrysophylax.openstreetmap.org", - "drogon.openstreetmap.org", - "viserion.openstreetmap.org" - ] + :tile_parent => "pilsen.render.openstreetmap.org" } ) diff --git a/roles/gorynych.rb b/roles/gorynych.rb index ed4918e13..1799f18dc 100644 --- a/roles/gorynych.rb +++ b/roles/gorynych.rb @@ -55,11 +55,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "moscow.render.openstreetmap.org", - :tile_siblings => [ - "noomoahk.openstreetmap.org", - "cmok.openstreetmap.org" - ] + :tile_parent => "moscow.render.openstreetmap.org" } ) diff --git a/roles/jakelong.rb b/roles/jakelong.rb index b81000f4a..5fc22b2b0 100644 --- a/roles/jakelong.rb +++ b/roles/jakelong.rb @@ -58,13 +58,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "sanfrancisco.render.openstreetmap.org", - :tile_siblings => [ - "stormfly-02.openstreetmap.org", - "ascalon.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org" - ] + :tile_parent => "sanfrancisco.render.openstreetmap.org" } ) diff --git a/roles/kalessin.rb b/roles/kalessin.rb index b1e728219..2ab415ca5 100644 --- a/roles/kalessin.rb +++ b/roles/kalessin.rb @@ -43,12 +43,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "germany.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "keizer.openstreetmap.org" - ] + :tile_parent => "germany.render.openstreetmap.org" } ) diff --git a/roles/katie.rb b/roles/katie.rb index 82044753d..e6ddba69f 100644 --- a/roles/katie.rb +++ b/roles/katie.rb @@ -48,11 +48,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "germany.render.openstreetmap.org", - :tile_siblings => [ - "konqi.openstreetmap.org", - "keizer.openstreetmap.org" - ] + :tile_parent => "germany.render.openstreetmap.org" } ) diff --git a/roles/keizer.rb b/roles/keizer.rb index 5c3ddea26..ddbb758c4 100644 --- a/roles/keizer.rb +++ b/roles/keizer.rb @@ -37,11 +37,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "germany.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org" - ] + :tile_parent => "germany.render.openstreetmap.org" } ) diff --git a/roles/konqi.rb b/roles/konqi.rb index 1016e27a8..7cc2eb940 100644 --- a/roles/konqi.rb +++ b/roles/konqi.rb @@ -36,14 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "germany.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "trogdor.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org", - "simurgh.openstreetmap.org" - ] + :tile_parent => "germany.render.openstreetmap.org" } ) diff --git a/roles/ladon.rb b/roles/ladon.rb index 5534b0836..9db255576 100644 --- a/roles/ladon.rb +++ b/roles/ladon.rb @@ -42,14 +42,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "athens.render.openstreetmap.org", - :tile_siblings => [ - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "athens.render.openstreetmap.org" } ) diff --git a/roles/longma.rb b/roles/longma.rb index 842cf1a82..e2a498c4c 100644 --- a/roles/longma.rb +++ b/roles/longma.rb @@ -48,12 +48,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "hsinchu.render.openstreetmap.org", - :tile_siblings => [ - "balerion.openstreetmap.org", - "waima.openstreetmap.org", - "tuatara.openstreetmap.org" - ] + :tile_parent => "hsinchu.render.openstreetmap.org" } ) diff --git a/roles/necrosan.rb b/roles/necrosan.rb index 66fdf569b..f7f68df3c 100644 --- a/roles/necrosan.rb +++ b/roles/necrosan.rb @@ -36,15 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "france.render.openstreetmap.org", - :tile_siblings => [ - # "necrosan.openstreetmap.org", - "nepomuk.openstreetmap.org", - "noomoahk.openstreetmap.org", - "norbert.openstreetmap.org", - "ladon.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "france.render.openstreetmap.org" } ) diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb index 4c0b7b0b9..bfa5982aa 100644 --- a/roles/nepomuk.rb +++ b/roles/nepomuk.rb @@ -67,15 +67,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "france.render.openstreetmap.org", - :tile_siblings => [ - # "necrosan.openstreetmap.org", # IO Overloaded - # "nepomuk.openstreetmap.org", - "noomoahk.openstreetmap.org", - "norbert.openstreetmap.org", - "ladon.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "france.render.openstreetmap.org" } ) diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb index c223168cd..004381680 100644 --- a/roles/nidhogg.rb +++ b/roles/nidhogg.rb @@ -36,13 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "sweden.render.openstreetmap.org", - :tile_siblings => [ - "fafnir.openstreetmap.org", - "ridgeback.openstreetmap.org", - "rimfaxe.openstreetmap.org", - "trogdor.openstreetmap.org" - ] + :tile_parent => "sweden.render.openstreetmap.org" } ) diff --git a/roles/noomoahk.rb b/roles/noomoahk.rb index ff30559ca..a22e80589 100644 --- a/roles/noomoahk.rb +++ b/roles/noomoahk.rb @@ -36,15 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "france.render.openstreetmap.org", - :tile_siblings => [ - # "necrosan.openstreetmap.org", # IO Overloaded - "nepomuk.openstreetmap.org", - # "noomoahk.openstreetmap.org", - "norbert.openstreetmap.org", - "ladon.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "france.render.openstreetmap.org" } ) diff --git a/roles/norbert.rb b/roles/norbert.rb index 9cc25b69e..1ab77bb8f 100644 --- a/roles/norbert.rb +++ b/roles/norbert.rb @@ -43,11 +43,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "france.render.openstreetmap.org", - :tile_siblings => [ - "noomoahk.openstreetmap.org", - "ladon.openstreetmap.org" - ] + :tile_parent => "france.render.openstreetmap.org" } ) diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb index 4da85ce2b..42926b946 100644 --- a/roles/ridgeback.rb +++ b/roles/ridgeback.rb @@ -59,14 +59,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "oslo.render.openstreetmap.org", - :tile_siblings => [ - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "gorynych.openstreetmap.org", - "simurgh.openstreetmap.org" - ] + :tile_parent => "oslo.render.openstreetmap.org" } ) diff --git a/roles/rimfaxe.rb b/roles/rimfaxe.rb index a6f5e1a52..383f75490 100644 --- a/roles/rimfaxe.rb +++ b/roles/rimfaxe.rb @@ -36,13 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "aalborg.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "aalborg.render.openstreetmap.org" } ) diff --git a/roles/saphira.rb b/roles/saphira.rb index 1d9ae6a73..1c4b9a1b7 100644 --- a/roles/saphira.rb +++ b/roles/saphira.rb @@ -43,15 +43,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "london.render.openstreetmap.org", - :tile_siblings => [ - "toothless.openstreetmap.org", - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "london.render.openstreetmap.org" } ) diff --git a/roles/sarkany.rb b/roles/sarkany.rb index 58f9d4952..93d42ed88 100644 --- a/roles/sarkany.rb +++ b/roles/sarkany.rb @@ -43,13 +43,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "budapest.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "budapest.render.openstreetmap.org" } ) diff --git a/roles/simurgh.rb b/roles/simurgh.rb index b0be37c78..3923f4fcb 100644 --- a/roles/simurgh.rb +++ b/roles/simurgh.rb @@ -35,12 +35,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "baku.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org" - ] + :tile_parent => "baku.render.openstreetmap.org" } ) diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb index d87fa831b..455173197 100644 --- a/roles/stormfly-02.rb +++ b/roles/stormfly-02.rb @@ -32,8 +32,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "corvallis.render.openstreetmap.org", - :tile_siblings => [] + :tile_parent => "corvallis.render.openstreetmap.org" } ) diff --git a/roles/toothless.rb b/roles/toothless.rb index 72e4ba877..fefc1e484 100644 --- a/roles/toothless.rb +++ b/roles/toothless.rb @@ -36,15 +36,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "london.render.openstreetmap.org", - :tile_siblings => [ - "saphira.openstreetmap.org", - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "london.render.openstreetmap.org" } ) diff --git a/roles/trogdor.rb b/roles/trogdor.rb index c4c5119a6..09dd94576 100644 --- a/roles/trogdor.rb +++ b/roles/trogdor.rb @@ -39,14 +39,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "amsterdam.render.openstreetmap.org", - :tile_siblings => [ - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org", - "simurgh.openstreetmap.org" - ] + :tile_parent => "amsterdam.render.openstreetmap.org" } ) diff --git a/roles/tuatara.rb b/roles/tuatara.rb index 5399d6f14..4b56ff3fb 100644 --- a/roles/tuatara.rb +++ b/roles/tuatara.rb @@ -28,12 +28,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "wellington.render.openstreetmap.org", - :tile_siblings => [ - "waima.openstreetmap.org", - "balerion.openstreetmap.org", - "longma.openstreetmap.org" - ] + :tile_parent => "wellington.render.openstreetmap.org" } ) diff --git a/roles/vipertooth.rb b/roles/vipertooth.rb index eaa359b0f..e91318a99 100644 --- a/roles/vipertooth.rb +++ b/roles/vipertooth.rb @@ -37,13 +37,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "kiev.render.openstreetmap.org", - :tile_siblings => [ - "cmok.openstreetmap.org", - "sarkany.openstreetmap.org", - "kalessin.openstreetmap.org", - "konqi.openstreetmap.org" - ] + :tile_parent => "kiev.render.openstreetmap.org" } ) diff --git a/roles/viserion.rb b/roles/viserion.rb index 4c8d31aa0..33675f1aa 100644 --- a/roles/viserion.rb +++ b/roles/viserion.rb @@ -51,10 +51,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "pula.render.openstreetmap.org", - :tile_siblings => [ - "drogon.openstreetmap.org" - ] + :tile_parent => "pula.render.openstreetmap.org" } ) diff --git a/roles/waima.rb b/roles/waima.rb index 2fbde7cd7..e614caa11 100644 --- a/roles/waima.rb +++ b/roles/waima.rb @@ -29,12 +29,7 @@ default_attributes( ] }, :tilecache => { - :tile_parent => "hamilton.render.openstreetmap.org", - :tile_siblings => [ - "tuatara.openstreetmap.org", - "balerion.openstreetmap.org", - "longma.openstreetmap.org" - ] + :tile_parent => "hamilton.render.openstreetmap.org" } ) -- 2.43.2