Merge remote-tracking branch 'github/pull/705'

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index 85124e485f89e22b0337048d595bb6f60a294c5c..594c18f842334523036f53e869319eca640d7c51 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -5,16 +5,19 @@ default_attributes(
   :accounts => {
     :users => {
       :rails => {
   :accounts => {
     :users => {
       :rails => {

-        :status => :role,

         :members => [:tomh, :grant]
       }
     }
   },
         :members => [:tomh, :grant]
       }
     }
   },

+  :exim => {
+    :trusted_users => ["rails"]
+  },

   :passenger => {
   :passenger => {

-    :pool_idle_time => 0
+    :pool_idle_time => 3600

   },
   :web => {
   },
   :web => {

-    :status => "online"
+    :status => "online",
+    :memcached_servers => %w[spike-06.ams spike-07.ams spike-08.ams]

   }
 )
 
   }
 )