X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e29e45b6cf7d91f3349a22b41e6ee5b23887e922..2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b:/roles/web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 741a40b90..500fb437f 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -15,14 +15,14 @@ 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 }
       ]
     }
   },
-  :networking => {
-    :tcp_fastopen_key => "www"
+  :memcached => {
+    :memory_limit => 4096
   },
   :passenger => {
     :max_pool_size => 50
@@ -37,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"
+        }
       }
     }
   }