X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b9c1035ceee9fd2fc76c1488d056b9eb57ae84f2..bdb0740403f851dfe9121638d9e0102507a633ec:/roles/web-backend.rb

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index a89c3e933..d59ce812e 100644
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -5,17 +5,14 @@ default_attributes(
   :apache => {
     :mpm => "worker",
     :worker => {
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   },
-  :apt => {
-    :sources => ["openstreetmap-cgimap"]
-  },
   :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" } }
       ]
     }
   },