X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/77d9c4b9d3224778c720cb036344e6d06245a788..e61e02b852c45c5688194e4693e5b5cee7028b7f:/roles/ucl.rb?ds=inline

diff --git a/roles/ucl.rb b/roles/ucl.rb
index cb6bfce9b..27064ea23 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,14 +2,33 @@ 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 => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.0.3"
+        }
+      },
+      :external => {
+        :zone => "ucl",
+        :inet => {
+          :prefix => "24",
+          :gateway => "193.60.236.254"
+        }
+      }
+    }
   }
 )
 
 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"]
   }
 )