X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dc7c507259804d72756728eb28fadd84adb87ff6..535456508231fd5fd5e4c3d6671cb7a018b39771:/roles/tile.rb?ds=inline diff --git a/roles/tile.rb b/roles/tile.rb index a0b0e4a23..9065969c0 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -15,11 +15,12 @@ default_attributes( :timeout => 60, :event => { :server_limit => 60, - :max_clients => 1200, + :max_request_workers => 1200, :threads_per_child => 20, - :min_spare_threads => 30, - :max_spare_threads => 180, - :max_requests_per_child => 100000 + :min_spare_threads => 300, + :max_spare_threads => 1200, + :max_connections_per_child => 0, + :async_request_worker_factor => 4 } }, :munin => { @@ -34,13 +35,18 @@ default_attributes( :postgresql => { :settings => { :defaults => { + :max_connections => "250", :temp_buffers => "32MB", :work_mem => "128MB", :wal_buffers => "1024kB", :wal_writer_delay => "500ms", :commit_delay => "10000", :checkpoint_segments => "60", - :max_wal_size => "2880MB" + :max_wal_size => "2880MB", + :random_page_cost => "1.1", + :track_activity_query_size => "16384", + :autovacuum_vacuum_scale_factor => "0.05", + :autovacuum_analyze_scale_factor => "0.02" } } }, @@ -62,7 +68,7 @@ default_attributes( :tile => { :data => { :world_boundaries => { - :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz" + :url => "https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz" }, :simplified_land_polygons => { :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip", @@ -88,7 +94,7 @@ default_attributes( :styles => { :default => { :repository => "git://github.com/gravitystorm/openstreetmap-carto.git", - :revision => "v2.43.0", + :revision => "v4.14.0", :max_zoom => 19 } }