X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/639b0336707d6c44b11b84c8b03861d580190c83..9f3223b2439a3a82658ea8d28b944bd1c5f4c818:/roles/web-frontend.rb diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 4d82bd4f6..0435872dd 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -15,18 +15,20 @@ default_attributes( }, :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" } } ] } }, + :networking => { + :tcp_fastopen_key => "www" + }, :passenger => { :max_pool_size => 50 }, :exim => { :local_domains => ["messages.openstreetmap.org"], - :trusted_users => ["rails"], :routes => { :messages => { :comment => "messages.openstreetmap.org", @@ -35,7 +37,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" + } } } }