X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7ebe049da32826028cab723019f14159dfcee8d1..d544597a84d545711f90b687d924e010254aebc5:/roles/wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index acd0cef1c..69a8743e2 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,16 +8,23 @@ default_attributes(
     }
   },
   :apache => {
-    :timeout => 30
+    :mpm => "event",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_request_workers => 800,
+      :threads_per_child => 50,
+      :max_connections_per_child => 10000
+    }
   },
   :elasticsearch => {
-    :version => "5.x",
+    :version => "6.x",
     :cluster => {
       :name => "wiki"
     }
   },
   :exim => {
-    :trusted_users => ["www-data"],
+    :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
     },
@@ -41,8 +48,6 @@ default_attributes(
         :innodb_buffer_pool_size => "4G",
         :key_buffer_size => "64M",
         :max_connections => "200",
-        :query_cache_size => "256M",
-        :query_cache_type => "1",
         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }