Update kitchen tests for changes to frontend and backend services

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index edb21ab291abd69d798edc7f64c423e2be926c29..be9510f7003fe6f4ee730bc718af5752ae4139da 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apache => {
-    :mpm => "prefork",
+    :mpm => "event",
     :timeout => 30,
     :event => {
       :server_limit => 32,
@@ -18,12 +18,9 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "5.x",
     :cluster => {
       :name => "wiki"
-    },
-    :script => {
-      :disable_dynamic => false
     }
   },
   :exim => {
@@ -52,6 +49,7 @@ default_attributes(
         :key_buffer_size => "64M",
         :max_connections => "200",
         :query_cache_size => "256M",
+        :query_cache_type => "1",
         :sort_buffer_size => "8M",
         :tmp_table_size => "128M"
       }