X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..0f600cd42fa0991516c08b681efd3ca3c65c75a5:/roles/web-frontend.rb?ds=inline diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index eab62f715..500fb437f 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -5,32 +5,42 @@ 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 => { + "filebeat.inputs" => [ + { "type" => "filestream", "id" => "apache", "paths" => ["/var/log/apache2/access.log"], "fields" => { "type" => "apache" }, "fields_under_root" => true }, + { "type" => "filestream", "id" => "rails", "paths" => ["/var/log/web/rails-logstash.log"], "fields" => { "type" => "rails" }, "fields_under_root" => true } + ] } }, + :memcached => { + :memory_limit => 4096 + }, :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"], :routes => { :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", + :environment => { + "RAILS_ENV" => "production" + } } } } @@ -38,5 +48,6 @@ default_attributes( run_list( "role[web]", + "role[logstash-forwarder]", "recipe[web::frontend]" )