Don't redirect 127.0.0.1 as doing so can break munin

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 523e73c52601a61f8488ae2cb74a5712e805ffb1..9298395afb272362099d8b3baaa92baa091a79e2 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,8 +7,16 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
+  :elasticsearch => {
+    :cluster => {
+      :name => "wiki"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
+  },
   :exim => {
-    :trusted_users => [ "www-data" ],
+    :trusted_users => ["www-data"],
     :aliases => {
       :root => "grant"
     },
@@ -31,14 +39,14 @@ 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
     }
   }
 )
 
 run_list(
-  "recipe[elasticsearch]",
+  "role[elasticsearch]",
   "recipe[wiki]"
 )