X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bfb91c8a040865ddae7649c7c3594f59aac24691..7d18fb205649536971d712513bdf076180a4c13b:/roles/web.rb

diff --git a/roles/web.rb b/roles/web.rb
index 30069f148..85e4e9821 100644
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -5,24 +5,22 @@ default_attributes(
   :accounts => {
     :users => {
       :rails => {
-        :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]
       }
     }
   },
-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
+  :exim => {
+    :trusted_users => ["rails"]
   },
   :passenger => {
-    :pool_idle_time => 0
+    :pool_idle_time => 3600
   },
   :web => {
     :status => "online",
-    :database_host => "db",
-    :readonly_database_host => "katla"
+    :memcached_servers => %w[rails1.ams rails2.ams rails3.ams]
   }
 )
 
 run_list(
-  "recipe[nfs]"
+  "role[web-db]"
 )