name template script correctly

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index eab62f715dcc404b623c3d046b05cd0475021ff6..974ef3b803e2650dd64fd3472ce43ef15f29828c 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -13,13 +13,17 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
+  :logstash => {
+    :forwarder => {
+      :files => [
+        { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } },
+        { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } }
+      ]
+    }
+  },
   :passenger => {
     :max_pool_size => 50
   },
-  :web => {
-    :rails_soft_memory_limit => 256,
-    :rails_hard_memory_limit => 1024
-  },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
     :trusted_users => ["rails"],
@@ -30,7 +34,8 @@ default_attributes(
         :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
         :user => "rails",
         :group => "rails",
-        :home_directory => "/srv/www.openstreetmap.org/rails"
+        :home_directory => "/srv/www.openstreetmap.org/rails",
+        :path => "/bin:/usr/bin:/usr/local/bin"
       }
     }
   }
@@ -38,5 +43,6 @@ default_attributes(
 
 run_list(
   "role[web]",
+  "role[logstash-forwarder]",
   "recipe[web::frontend]"
 )