X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2ac0e59a7e95fc697d1673c11f8f2f0ce125f725..b173c492c728598a8ad0e7fcba23fd2a127f6e78:/roles/web.rb

diff --git a/roles/web.rb b/roles/web.rb
index 7a6c8a6c1..594c18f84 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -5,23 +5,22 @@ default_attributes(
   :accounts => {
     :users => {
       :rails => {
-        :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
+  :exim => {
+    :trusted_users => ["rails"]
   },
-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
+  :passenger => {
+    :pool_idle_time => 3600
   },
   :web => {
     :status => "online",
-    :database_host => "db"
+    :memcached_servers => %w[spike-06.ams spike-07.ams spike-08.ams]
   }
 )
 
 run_list(
-  "recipe[nfs]"
+  "role[web-db]"
 )