Update wiki to mediawiki 1.28

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index cb533575f21ad92d8b2621f94ef84b0d03d2935c..4b419aa16920f453665f4344bcfd158354872df0 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,8 +8,12 @@ default_attributes(
     }
   },
   :elasticsearch => {
+    :version => "2.x",
     :cluster => {
       :name => "wiki"
+    },
+    :script => {
+      :disable_dynamic => false
     }
   },
   :exim => {
@@ -36,9 +40,9 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
-      :max_clients => 800,
+      :max_request_workers => 800,
       :threads_per_child => 50,
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   }
 )