X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..065f13db39cd1d0468bca37430eebacc0be01318:/roles/web-backend.rb

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index 6c87efcbd..4c6dff43f 100644
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -5,20 +5,27 @@ default_attributes(
   :apache => {
     :mpm => "worker",
     :worker => {
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   },
-  :memcached  => {
-    :memory_limit => 512
+  :logstash => {
+    :forwarder => {
+      :files => [
+        { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } },
+        { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } }
+      ]
+    }
+  },
+  :memcached => {
+    :memory_limit => 4096
   },
-  :web => {
-    :rails_daemon_limit => 12,
-    :rails_soft_memory_limit => 512,
-    :rails_hard_memory_limit => 2048
+  :passenger => {
+    :max_pool_size => 12
   }
 )
 
 run_list(
   "role[web]",
+  "role[logstash-forwarder]",
   "recipe[web::backend]"
 )