X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..6f0d0a550d615d459fc3b4e60bd233da86c6e64d:/roles/ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index e61a04f7d..27064ea23 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,9 +2,7 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
-  :bind => {
-    :forwarders => [ "144.82.100.1", "144.82.100.41" ]
-  },
+  :location => "Slough, England",
   :networking => {
     :roles => {
       :internal => {
@@ -17,25 +15,20 @@ default_attributes(
         :zone => "ucl",
         :inet => {
           :prefix => "24",
-          :gateway => "128.40.168.126"
+          :gateway => "193.60.236.254"
         }
       }
     }
-  },
-  :sysctl => {
-    :sack => {
-      :comment => "Disable SACK as the UCL firewall breaks it",
-      :parameters => { 
-        "net.ipv4.tcp_sack" => "0"
-      }
-    }
   }
-
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"],
+    :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
+  },
   :ntp => {
-    :servers => [ "ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk" ]
+    :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"]
   }
 )