Update wiki to mediawiki 1.28

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 300c826bd815d8a3c82a468bf9cd83071bfada72..54744583856266fde462112ba7c8d45625b0ca6e 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -15,11 +15,12 @@ default_attributes(
     :timeout => 60,
     :event => {
       :server_limit => 60,
     :timeout => 60,
     :event => {
       :server_limit => 60,

-      :max_clients => 1200,
+      :max_request_workers => 1200,

       :threads_per_child => 20,
       :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 => {
     }
   },
   :munin => {


@@ -89,7 +90,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v2.43.0",
+        :revision => "v3.1.0",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }