Allow CiviCRM to set envelope sender addresses

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d925702c8ee5489a743da3b832318e678838f3f6..47e12e7d0012c80b736fe3a8be71b626abfab603 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -8,11 +8,6 @@ default_attributes(
       :certificate_chain => "startcom"
     }
   },
       :certificate_chain => "startcom"
     }
   },

-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"


@@ -87,7 +82,7 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
 
 run_list(
   "role[ucl-wolfson]",

-  "role[hp-g6]",
+  "role[hp-dl360-g6]",

   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",