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

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index 51d7c477e..a3cf9413b 100644
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -3,20 +3,21 @@ 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
     }
   },
   :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" } }
       ]
     }
   },
-  :memcached  => {
+  :memcached => {
     :memory_limit => 4096
   },
   :passenger => {