X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e7700a052e1494d3a3ccd18445b18bf43a43d6b1..867b64809332c9c9aafbe99a2f65a43747f11c09:/roles/ucl.rb?ds=sidebyside

diff --git a/roles/ucl.rb b/roles/ucl.rb
index 2dd44ee70..27064ea23 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,13 +2,31 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
-  :bind => {
-    :forwarders => ["144.82.100.1", "144.82.100.41"]
-  },
-  :location => "London, England"
+  :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"]
   }