Make karm the database master

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index a57d2ec54dc7c9e133ca76eef0d37cd506726b47..6acffead33efa323a904427d41ad6fb397152273 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -11,11 +11,14 @@ default_attributes(
     }
   },
   :passenger => {
-    :pool_idle_time => 0
+    :pool_idle_time => 3600
   },
   :web => {
-    :status => "online",
-    :database_host => "katla.bm.openstreetmap.org",
-    :readonly_database_host => "ramoth.ic.openstreetmap.org"
+    :status => "database_readonly",
+    :memcached_servers => %w[rails1.ams rails2.ams rails3.ams]
   }
 )
+
+run_list(
+  "role[web-db]"
+)