X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1a1b82f02357f19b9b953f1264c7ea3587c74568..867b64809332c9c9aafbe99a2f65a43747f11c09:/roles/ucl.rb?ds=sidebyside diff --git a/roles/ucl.rb b/roles/ucl.rb index b4bb93a47..27064ea23 100644 --- a/roles/ucl.rb +++ b/roles/ucl.rb @@ -2,22 +2,33 @@ name "ucl" description "Role applied to all servers at UCL" default_attributes( - :bind => { - :forwarders => [ "144.82.100.1", "144.82.100.41" ] - }, - :sysctl => { - :sack => { - :comment => "Disable SACK as the UCL firewall breaks it", - :parameters => { - "net.ipv4.tcp_sack" => "0" + :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" ] + :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"] } )