Sort list of tool packages

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index 2dd44ee70d741166cc08181046523a06a58ec477..516c925d39f5e81073d242ca1d7a88425287596a 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,13 +2,37 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
 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",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.0.3" }
+          }
+        }
+      },
+      :external => {
+        :zone => "ucl",
+        :inet => {
+          :prefix => "24",
+          :gateway => "193.60.236.254"
+        }
+      }
+    },
+    :wireguard => {
+      :keepalive => 180
+    }
+  }

 )
 
 override_attributes(
 )
 
 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"]
   }
   :ntp => {
     :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"]
   }