X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/75f4f224fbe305d36c223c2fb03e285a49c1d3a7..484bf308fb9f43eda4c2d7ac7b3d3d23a3288044:/roles/wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index cb533575f..acd0cef1c 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,7 +7,11 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
+  :apache => {
+    :timeout => 30
+  },
   :elasticsearch => {
+    :version => "5.x",
     :cluster => {
       :name => "wiki"
     }
@@ -31,14 +35,17 @@ default_attributes(
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
   },
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_clients => 800,
-      :threads_per_child => 50,
-      :max_requests_per_child => 10000
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :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"
+      }
     }
   }
 )