X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e1bad7cf91c5b6ac6b435d2489b55ab86b165d9a..dc7c507259804d72756728eb28fadd84adb87ff6:/roles/web.rb?ds=sidebyside

diff --git a/roles/web.rb b/roles/web.rb
index 04a52e80b..dce003b3d 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -6,23 +6,19 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
-  },
-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
+  :passenger => {
+    :pool_idle_time => 0
   },
   :web => {
     :status => "online",
-    :database_host => "db",
-    :readonly_database_host => "katla"
+    :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
   }
 )
 
 run_list(
-  "recipe[nfs]"
+  "role[web-db]"
 )