Merge remote-tracking branch 'github/pull/272'

[chef.git] / roles / web-backend.rb

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index 5cda57edce712a577dad5a4aa8b7e263917d6167..d59ce812e00c9608aa0301b520725e70f95477b2 100644 (file)
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -5,20 +5,27 @@ default_attributes(
   :apache => {
     :mpm => "worker",
     :worker => {
   :apache => {
     :mpm => "worker",
     :worker => {

-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000

     }
   },
     }
   },

-  :memcached  => {
+  :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" } }
+      ]
+    }
+  },
+  :memcached => {

     :memory_limit => 4096
   },
     :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]",
   }
 )
 
 run_list(
   "role[web]",

+  "role[logstash-forwarder]",

   "recipe[web::backend]"
 )
   "recipe[web::backend]"
 )