Pass authentication headers to cgimap so that it can handle OAuth.

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index deb62f7c7b38187245ab6d84ce45a6abf38eb064..971a51b3744ed636d83f971cc97e8a56c8bf2fb3 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -13,24 +13,29 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
       :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
   },
   :passenger => {
     :max_pool_size => 50
   },

-  :web => {
-    :rails_soft_memory_limit => 256,
-    :rails_hard_memory_limit => 1024
-  },

   :exim => {
   :exim => {

-    :local_domains => [ "messages.openstreetmap.org" ],
-    :trusted_users => [ "rails" ],
+    :local_domains => ["messages.openstreetmap.org"],
+    :trusted_users => ["rails"],

     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",

-        :domains => [ "messages.openstreetmap.org" ],
-        :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
+        :domains => ["messages.openstreetmap.org"],
+        :command => "/usr/local/bin/passenger-ruby /srv/www.openstreetmap.org/rails/script/deliver-message $local_part",

         :user => "rails",
         :group => "rails",
         :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]",
 
 run_list(
   "role[web]",

+  "role[logstash-forwarder]",

   "recipe[web::frontend]"
 )
   "recipe[web::frontend]"
 )