X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/07074011fa21aef90a1c7cacb177418aac78739b..bb6a3be37eb6b0de039c6451dcad0fe3bddbf55d:/roles/ucl.rb diff --git a/roles/ucl.rb b/roles/ucl.rb index 7715e629a..a0f5331f4 100644 --- a/roles/ucl.rb +++ b/roles/ucl.rb @@ -2,18 +2,16 @@ name "ucl" 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", - :gateway => "10.0.0.3" + :gateway => "10.0.0.3", + :routes => { + "10.0.0.0/8" => { :via => "10.0.0.3" } + } } }, :external => { @@ -23,13 +21,16 @@ default_attributes( :gateway => "193.60.236.254" } } + }, + :wireguard => { + :keepalive => 180 } } ) 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 => {