X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b9c1035ceee9fd2fc76c1488d056b9eb57ae84f2..221416602c42f7743aa984b24211370b05ba0bae:/roles/web-backend.rb?ds=sidebyside

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index a89c3e933..a3cf9413b 100644
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -3,19 +3,17 @@ description "Role applied to all web/api backend servers"
 
 default_attributes(
   :apache => {
-    :mpm => "worker",
-    :worker => {
-      :max_requests_per_child => 10000
+    :mpm => "event",
+    :event => {
+      :max_connections_per_child => 10000,
+      :async_request_worker_factor => 4
     }
   },
-  :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" } }
       ]
     }
   },