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

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index 9e1cc92210e2fdacbe3c0d4d6c65def6c065afc9..a3bcbc9b36d3fe388d532ad6a5dc43b763866b33 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -6,23 +6,19 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
-  },
   :passenger => {
-    :pool_idle_time => 0
+    :pool_idle_time => 3600
   },
   :web => {
-    :status => "gpx_offline",
-    :database_host => "db",
-    :readonly_database_host => "katla"
+    :status => "online",
+    :memcached_servers => %w[rails1.ams rails2.ams rails3.ams]
   }
 )
 
 run_list(
-  "recipe[nfs]"
+  "role[web-db]"
 )