X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6cfcfbe0138f1b11e9a62bd8193e729126f617ee..21c251d4b15d31087c1d892495f3d88e4cbe2840:/roles/web-frontend.rb?ds=sidebyside diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index eab62f715..4d82bd4f6 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -5,21 +5,25 @@ 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 => { + :forwarder => { + :files => [ + { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } }, + { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } } + ] } }, :passenger => { :max_pool_size => 50 }, - :web => { - :rails_soft_memory_limit => 256, - :rails_hard_memory_limit => 1024 - }, :exim => { :local_domains => ["messages.openstreetmap.org"], :trusted_users => ["rails"], @@ -27,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" } } } @@ -38,5 +43,6 @@ default_attributes( run_list( "role[web]", + "role[logstash-forwarder]", "recipe[web::frontend]" )