X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae56a522a5782d71b7b758464e2592ac0d2ef07f..c954aeff2861e3c9fcd8e236f08a2b15f4a00202:/roles/web-frontend.rb?ds=inline diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 5f23e0618..500fb437f 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -15,18 +15,20 @@ default_attributes( }, :logstash => { :forwarder => { - "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" } } + "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 }, :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" + } } } }