Revert "Switch to emergency frontend only setup"

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 7657b82674384a513ed7bf5110fa4322cc149a31..eab62f715dcc404b623c3d046b05cd0475021ff6 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -13,18 +13,20 @@ default_attributes(
       :max_requests_per_child => 10000
     }
   },
+  :passenger => {
+    :max_pool_size => 50
+  },
   :web => {
-    :rails_daemon_limit => 50,
-    :rails_soft_memory_limit => 192,
-    :rails_hard_memory_limit => 512
+    :rails_soft_memory_limit => 256,
+    :rails_hard_memory_limit => 1024
   },
   :exim => {
-    :local_domains => [ "messages.openstreetmap.org" ],
-    :trusted_users => [ "rails" ],
+    :local_domains => ["messages.openstreetmap.org"],
+    :trusted_users => ["rails"],
     :routes => {
       :messages => {
         :comment => "messages.openstreetmap.org",
-        :domains => [ "messages.openstreetmap.org" ],
+        :domains => ["messages.openstreetmap.org"],
         :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
         :user => "rails",
         :group => "rails",