Update chef client to 12.10.24

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index b4bb93a47534e473acc6d321c6692ff91fbdf077..2dd44ee70d741166cc08181046523a06a58ec477 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -3,21 +3,14 @@ description "Role applied to all servers at UCL"
 
 default_attributes(
   :bind => {
 
 default_attributes(
   :bind => {

-    :forwarders => [ "144.82.100.1", "144.82.100.41" ]
+    :forwarders => ["144.82.100.1", "144.82.100.41"]

   },
   },

-  :sysctl => {
-    :sack => {
-      :comment => "Disable SACK as the UCL firewall breaks it",
-      :parameters => { 
-        "net.ipv4.tcp_sack" => "0"
-      }
-    }
-  }
+  :location => "London, England"

 )
 
 override_attributes(
   :ntp => {
 )
 
 override_attributes(
   :ntp => {

-    :servers => [ "ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk" ]
+    :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"]

   }
 )
 
   }
 )