X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/da1115e80fdbca939aa7b2f8b2027705f1c32b24..1b2c429da3de1e8d5a077027e1f90a4114652d2a:/roles/web-frontend.rb diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 1a7c7ce7a..974ef3b80 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -13,24 +13,29 @@ default_attributes( :max_requests_per_child => 10000 } }, + :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 => 192, - :rails_hard_memory_limit => 512 - }, :exim => { - :local_domains => [ "messages.openstreetmap.org" ], - :trusted_users => [ "rails" ], + :local_domains => ["messages.openstreetmap.org"], + :trusted_users => ["rails"], :routes => { :messages => { :comment => "messages.openstreetmap.org", - :domains => [ "messages.openstreetmap.org" ], + :domains => ["messages.openstreetmap.org"], :command => "/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]" )