Remove rails memory limit support

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index a27a94a6ae31c1731e76412656c18bdb85851095..7e67d19603eacb0d93fe2a28294f230a0694f28a 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -6,19 +6,21 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
     :users => {
       :rails => {
         :status => :role,

-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]

       }
     }
   },
       }
     }
   },

-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
-  },

   :nfs => {
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :nfs => {
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },

+  :passenger => {
+    :version => 4,
+    :pool_idle_time => 0
+  },

   :web => {
   :web => {

-    :status => "database_readonly",
-    :database_host => "smaug"
+    :status => "online",
+    :database_host => "db",
+    :readonly_database_host => "db-slave"

   }
 )
 
   }
 )