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

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 5f23e0618361d3e7ee76c300cc3821b42b808eb3..2a316491a07e6cbe1c37a54e90eb8fd3fdecae38 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -21,12 +21,14 @@ default_attributes(
       ]
     }
   },
+  :memcached => {
+    :memory_limit => 4096
+  },
   :passenger => {
     :max_pool_size => 50
   },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
-    :trusted_users => ["rails"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
@@ -35,7 +37,10 @@ default_attributes(
         :user => "rails",
         :group => "rails",
         :home_directory => "/srv/www.openstreetmap.org/rails",
-        :path => "/bin:/usr/bin:/usr/local/bin"
+        :path => "/bin:/usr/bin:/usr/local/bin",
+        :environment => {
+          "RAILS_ENV" => "production"
+        }
       }
     }
   }