nominatim: remove old php settings

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index e61a04f7dfafd69b06d680ab58efaada2dd5cbd6..a0f5331f4a6c3c49ef44059e8481bd23b5cb2c2c 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,40 +2,39 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
-  :bind => {
-    :forwarders => [ "144.82.100.1", "144.82.100.41" ]
-  },
+  :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 => {
         :zone => "ucl",
         :inet => {
           :prefix => "24",
-          :gateway => "128.40.168.126"
+          :gateway => "193.60.236.254"
         }
       }
-    }
-  },
-  :sysctl => {
-    :sack => {
-      :comment => "Disable SACK as the UCL firewall breaks it",
-      :parameters => { 
-        "net.ipv4.tcp_sack" => "0"
-      }
+    },
+    :wireguard => {
+      :keepalive => 180
     }
   }
-
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.0.0.3", "1.1.1.1", "1.0.0.1"],
+    :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"]
   }
 )