Make mediawiki sites redirect to https

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index a126bc169f4cd77fd70fa3e83042648b4d0eafd3..7dfc958fd7224287bb2d8a272be17c716e80ce4a 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -17,9 +17,10 @@ default_attributes(
       :server_limit => 60,
       :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"
       }
     }
@@ -89,7 +91,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.44.0",
+        :revision => "v4.6.0",
         :max_zoom => 19
       }
     }