X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0ef1f505202b9ebaacc3287f0aee36bae15f1644..a2900827db68ded079ed6a9f7d275aa618ed311d:/roles/tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 300c826bd..2e3d59cc1 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 => {
@@ -41,6 +42,7 @@ default_attributes(
         :commit_delay => "10000",
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",
+        :random_page_cost => "1.1",
         :track_activity_query_size => "16384"
       }
     }
@@ -63,7 +65,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",
@@ -89,7 +91,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.43.0",
+        :revision => "v4.6.0",
         :max_zoom => 19
       }
     }