Merge remote-tracking branch 'github/pull/696'

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index f3a0305950a45f574c118c520ec9957c79690d0c..516c925d39f5e81073d242ca1d7a88425287596a 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -8,7 +8,10 @@ default_attributes(
       :internal => {
         :inet => {
           :prefix => "20",
       :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 => {


@@ -18,6 +21,9 @@ default_attributes(
           :gateway => "193.60.236.254"
         }
       }
           :gateway => "193.60.236.254"
         }
       }

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

     }
   }
 )
     }
   }
 )


@@ -28,7 +34,7 @@ override_attributes(
     :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {

-    :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
+    :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"]

   }
 )
 
   }
 )