Update bundle

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index f1ecaac8c163635052292bbeea3871368e5e3c99..a3bcbc9b36d3fe388d532ad6a5dc43b763866b33 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -11,11 +11,14 @@ default_attributes(
     }
   },
   :passenger => {
     }
   },
   :passenger => {

-    :pool_idle_time => 0
+    :pool_idle_time => 3600

   },
   :web => {
   },
   :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]"
+)