X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/77c9573a7b67d1d82388620410c2830bca3317f7..a440b3e8d77d798ec4a67645d934cd0f817893dd:/roles/web-frontend.rb diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 971a51b37..3ecca30ff 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -5,19 +5,19 @@ 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" } } + "filebeat.prospectors" => [ + { "input_type" => "log", "paths" => ["/var/log/apache2/access.log"], "fields" => { "type" => "apache" } }, + { "input_type" => "log", "paths" => ["/var/log/web/rails-logstash.log"], "fields" => { "type" => "rails" } } ] } }, @@ -26,7 +26,6 @@ default_attributes( }, :exim => { :local_domains => ["messages.openstreetmap.org"], - :trusted_users => ["rails"], :routes => { :messages => { :comment => "messages.openstreetmap.org", @@ -35,7 +34,10 @@ default_attributes( :user => "rails", :group => "rails", :home_directory => "/srv/www.openstreetmap.org/rails", - :path => "/bin:/usr/bin:/usr/local/bin" + :path => "/bin:/usr/bin:/usr/local/bin", + :environment => { + "RAILS_ENV" => "production" + } } } }