X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/de16319004d8f13f3baba7dbe2e35dcf4bbebfa9..9ac8d4e7902640c053a89dd893934c4def5af83f:/roles/tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 2ab8769ce..1b0424b9c 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -15,36 +15,38 @@ 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 => {
     :plugins => {
       :renderd_processed => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk dropped"
-      },
-      :renderd_queue => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk"
-      },
-      :renderd_queue_time => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk"
+        :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",
-        :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"
       }
     }
   },
@@ -66,10 +68,10 @@ 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",
+        :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
         :refresh => true
       },
       :admin_boundaries => {
@@ -77,22 +79,22 @@ default_attributes(
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
       :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
       },
       :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.43.0",
+        :revision => "v4.19.0",
         :max_zoom => 19
       }
     }