Drop fafnir role

[chef.git] / roles / wiki.rb

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 4a775325a47e1ece599196f16c047a1909dff0df..9298395afb272362099d8b3baaa92baa091a79e2 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,6 +7,14 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
       :wiki => { :status => :role }
     }
   },

+  :elasticsearch => {
+    :cluster => {
+      :name => "wiki"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
+  },

   :exim => {
     :trusted_users => ["www-data"],
     :aliases => {
   :exim => {
     :trusted_users => ["www-data"],
     :aliases => {


@@ -31,14 +39,14 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_request_workers => 800,

       :threads_per_child => 50,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "recipe[elasticsearch]",
+  "role[elasticsearch]",

   "recipe[wiki]"
 )
   "recipe[wiki]"
 )