stormfly-01: remove taginfo role

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

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

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

     }
   },
   :logstash => {
     :forwarder => {
     }
   },
   :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" } }

       ]
     }
   },
       ]
     }
   },