Rename MaxClients to MaxRequestWorkers

[chef.git] / roles / web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index ec166cd95360c7f8a17256a522f9344454dfb772..646735bf23dd14decdbe9937e833aa52963f0e2e 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -6,15 +6,22 @@ default_attributes(
     :mpm => "event",
     :event => {
       :server_limit => 40,
-      :max_clients => 1000,
+      :max_request_workers => 1000,
       :min_spare_threads => 50,
       :max_spare_threads => 150,
       :threads_per_child => 50,
       :max_requests_per_child => 10000
     }
   },
+  :logstash => {
+    :forwarder => {
+      :files => [
+        { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } },
+        { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } }
+      ]
+    }
+  },
   :passenger => {
-    :version => 4,
     :max_pool_size => 50
   },
   :exim => {
@@ -24,10 +31,11 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
-        :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
+        :command => "/usr/local/bin/passenger-ruby /srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
         :user => "rails",
         :group => "rails",
-        :home_directory => "/srv/www.openstreetmap.org/rails"
+        :home_directory => "/srv/www.openstreetmap.org/rails",
+        :path => "/bin:/usr/bin:/usr/local/bin"
       }
     }
   }
@@ -35,5 +43,6 @@ default_attributes(
 
 run_list(
   "role[web]",
+  "role[logstash-forwarder]",
   "recipe[web::frontend]"
 )