From 96d84b07e92b47d13ffde25f21f361354a002d5c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 6 Sep 2026 15:55:47 +0100 Subject: [PATCH] Move tile_directories configuration to tile role --- roles/azure-01.rb | 9 --------- roles/azure-02.rb | 9 --------- roles/culebre.rb | 9 --------- roles/nidhogg.rb | 9 --------- roles/odin.rb | 9 --------- roles/orm.rb | 9 --------- roles/palulukon.rb | 9 --------- roles/piasa.rb | 9 --------- roles/quetzal.rb | 9 --------- roles/tile.rb | 5 ++++- roles/wawel.rb | 9 --------- roles/ysera.rb | 9 --------- 12 files changed, 4 insertions(+), 100 deletions(-) diff --git a/roles/azure-01.rb b/roles/azure-01.rb index 1658889a3..7d4096367 100644 --- a/roles/azure-01.rb +++ b/roles/azure-01.rb @@ -143,15 +143,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/azure-02.rb b/roles/azure-02.rb index 8a5a4dc9c..ae3e98190 100644 --- a/roles/azure-02.rb +++ b/roles/azure-02.rb @@ -143,15 +143,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/culebre.rb b/roles/culebre.rb index fac8a230f..74aa9859d 100644 --- a/roles/culebre.rb +++ b/roles/culebre.rb @@ -45,15 +45,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb index 07b822bea..68e2698b9 100644 --- a/roles/nidhogg.rb +++ b/roles/nidhogg.rb @@ -41,15 +41,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/odin.rb b/roles/odin.rb index 9a64322bb..e567a85c1 100644 --- a/roles/odin.rb +++ b/roles/odin.rb @@ -131,15 +131,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/orm.rb b/roles/orm.rb index 8b543f450..186cf4574 100644 --- a/roles/orm.rb +++ b/roles/orm.rb @@ -112,15 +112,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/palulukon.rb b/roles/palulukon.rb index a78a8ce12..6f08f2dda 100644 --- a/roles/palulukon.rb +++ b/roles/palulukon.rb @@ -39,15 +39,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/piasa.rb b/roles/piasa.rb index f54a45302..55cc22102 100644 --- a/roles/piasa.rb +++ b/roles/piasa.rb @@ -118,15 +118,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - }, } ) diff --git a/roles/quetzal.rb b/roles/quetzal.rb index 9487ba813..ab958923e 100644 --- a/roles/quetzal.rb +++ b/roles/quetzal.rb @@ -45,15 +45,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/tile.rb b/roles/tile.rb index cc3f819bf..483c15b16 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -106,7 +106,10 @@ default_attributes( :functions_script => "/srv/tile.openstreetmap.org/styles/default/functions.sql", :common_values_script => "/srv/tile.openstreetmap.org/styles/default/common-values.sql", :common_values_tables => %w[carto_pois], - :max_zoom => 19 + :max_zoom => 19, + :tile_directories => [ + { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } + ] } } } diff --git a/roles/wawel.rb b/roles/wawel.rb index 741626f2b..cb67df1bc 100644 --- a/roles/wawel.rb +++ b/roles/wawel.rb @@ -31,15 +31,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) diff --git a/roles/ysera.rb b/roles/ysera.rb index 448ad7495..8eb59ea9d 100644 --- a/roles/ysera.rb +++ b/roles/ysera.rb @@ -119,15 +119,6 @@ default_attributes( "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } - }, - :tile => { - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] - } - } } ) -- 2.47.3