Revert "Temporary nginx cache purge after depth change"

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index f1ecaac8c163635052292bbeea3871368e5e3c99..3276e43e4dc8bd7fdfbec542a1057c0dc61eadd3 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -10,12 +10,18 @@ default_attributes(
       }
     }
   },
+  :exim => {
+    :trusted_users => ["rails"]
+  },
   :passenger => {
-    :pool_idle_time => 0
+    :pool_idle_time => 3600
   },
   :web => {
-    :status => "database_readonly",
-    :database_host => "ramoth.ic.openstreetmap.org",
-    :readonly_database_host => "ramoth.ic.openstreetmap.org"
+    :status => "online",
+    :memcached_servers => %w[rails1.ams rails2.ams rails3.ams]
   }
 )
+
+run_list(
+  "role[web-db]"
+)