X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c8372fbc6df23a6a014341d453c48532b78fedbd..28ef79cefbf70b8ef85056009f69ecc3e7b1963e:/roles/tile.rb?ds=inline diff --git a/roles/tile.rb b/roles/tile.rb index 866339985..cb703ae71 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -15,22 +15,39 @@ 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, + :listen_cores_buckets_ratio => 6 + } + }, + :munin => { + :plugins => { + :renderd_processed => { + :graph_order => "reqPrio req reqLow dirty reqBulk dropped", + :reqPrio => { :draw => "AREA" }, + :req => { :draw => "STACK" } + } } }, :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" + :checkpoint_segments => "60", + :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" } } }, @@ -51,40 +68,39 @@ default_attributes( }, :tile => { :data => { - :world_boundaries => { - :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz" - }, :simplified_land_polygons => { - :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip", + :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip", + :refresh => true + }, + :simplified_water_polygons => { + :url => "https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-3857.zip", :refresh => true }, :admin_boundaries => { :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip", :directory => "ne_110m_admin_0_boundary_lines_land" }, - :populated_places => { - :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip", - :directory => "ne_10m_populated_places", - :original => "ne_10m_populated_places.shp", - :processed => "ne_10m_populated_places_fixed.shp" - }, :land_polygons => { - :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip", + :url => "https://osmdata.openstreetmap.de/download/land-polygons-split-3857.zip", + :refresh => true + }, + :water_polygons => { + :url => "https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip", :refresh => true }, :antarctica_icesheet_polygons => { - :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip", + :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-polygons-3857.zip", :refresh => true }, :antarctica_icesheet_outlines => { - :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip", + :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-outlines-3857.zip", :refresh => true } }, :styles => { :default => { :repository => "git://github.com/gravitystorm/openstreetmap-carto.git", - :revision => "v2.38.0", + :revision => "v4.24.1", :max_zoom => 19 } }