Fix noreply body lookup

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index 7715e629aaaf812e555f8f510505040783b0999c..a0f5331f4a6c3c49ef44059e8481bd23b5cb2c2c 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,18 +2,16 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
 description "Role applied to all servers at UCL"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },

   :location => "Slough, England",
   :networking => {
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
   :location => "Slough, England",
   :networking => {
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",

-          :gateway => "10.0.0.3"
+          :gateway => "10.0.0.3",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.0.3" }
+          }

         }
       },
       :external => {
         }
       },
       :external => {


@@ -23,13 +21,16 @@ default_attributes(
           :gateway => "193.60.236.254"
         }
       }
           :gateway => "193.60.236.254"
         }
       }

+    },
+    :wireguard => {
+      :keepalive => 180

     }
   }
 )
 
 override_attributes(
   :networking => {
     }
   }
 )
 
 override_attributes(
   :networking => {

-    :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"],
+    :nameservers => ["10.0.0.3", "1.1.1.1", "1.0.0.1"],

     :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {