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

diff --git a/roles/web.rb b/roles/web.rb
index 1e8c2666b..a3bcbc9b3 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -6,22 +6,19 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
-  },
-  :nfs => {
-    "/store/rails" => { :host => "horntail", :path => "/store/rails" }
+  :passenger => {
+    :pool_idle_time => 3600
   },
   :web => {
     :status => "online",
-    :database_host => "db"
+    :memcached_servers => %w[rails1.ams rails2.ams rails3.ams]
   }
 )
 
 run_list(
-  "recipe[nfs]"
+  "role[web-db]"
 )