Stop fight chef-server over configuration file permissions

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index e228e0efc43bbebd1c6800e708b74bd261dd8262..d6c144a68f2f08d283b8a85f5d5e80607ce94318 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -6,11 +6,11 @@ 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
+      :max_connections_per_child => 10000
     }
   },
   :logstash => {
@@ -31,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"
       }
     }
   }