X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a92c80c41d88faa20123f2841cc335c37905f638..8157de881da2e4f163e86879bb6cdba7161332aa:/roles/web-frontend.rb diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index e228e0efc..4d82bd4f6 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -5,12 +5,12 @@ default_attributes( :apache => { :mpm => "event", :event => { - :server_limit => 40, - :max_clients => 1000, - :min_spare_threads => 50, - :max_spare_threads => 150, + :server_limit => 20, + :max_request_workers => 1000, :threads_per_child => 50, - :max_requests_per_child => 10000 + :min_spare_threads => 50, + :max_spare_threads => 450, + :async_request_worker_factor => 4 } }, :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" } } }