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

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index eb3dfd1cd10034b74db6d419192cb1aa64f27c09..a0f5331f4a6c3c49ef44059e8481bd23b5cb2c2c 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,22 +21,16 @@ default_attributes(
           :gateway => "193.60.236.254"
         }
       }
           :gateway => "193.60.236.254"
         }
       }

-    }
-  },
-  :sysctl => {
-    :blackhole => {
-      :comment => "Force TCP level MTU probing because of known ICMP blackhole at UCL",
-      :parameters => {
-        "net.ipv4.tcp_mtu_probing" => "2",
-        "net.ipv4.tcp_base_mss" => "1024"
-      }
+    },
+    :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 => {