X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e4cd927b82f71acc58af48b9eb5757711c5e683b..9a904bd3d58cb74af7fbb87c98cee21bd8d3779e:/roles/web-frontend.rb?ds=sidebyside diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index faa1017de..971a51b37 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -13,6 +13,14 @@ 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 }, @@ -23,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" } } } @@ -34,5 +43,6 @@ default_attributes( run_list( "role[web]", + "role[logstash-forwarder]", "recipe[web::frontend]" )