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

[chef.git] / roles / web.rb

diff --git a/roles/web.rb b/roles/web.rb
index 30069f1482d60c05d6ee4a227e14a23e11ed8ba6..594c18f842334523036f53e869319eca640d7c51 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -5,24 +5,22 @@ default_attributes(
   :accounts => {
     :users => {
       :rails => {
   :accounts => {
     :users => {
       :rails => {

-        :status => :role,
-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]

       }
     }
   },
       }
     }
   },

-  :nfs => {
-    "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
+  :exim => {
+    :trusted_users => ["rails"]

   },
   :passenger => {
   },
   :passenger => {

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

   },
   :web => {
     :status => "online",
   },
   :web => {
     :status => "online",

-    :database_host => "db",
-    :readonly_database_host => "katla"
+    :memcached_servers => %w[spike-06.ams spike-07.ams spike-08.ams]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "recipe[nfs]"
+  "role[web-db]"

 )
 )