Merge branch 'feature/4506' into develop

4 files changed, 14 insertions, 1 deletions

diff --git a/.gitmodules b/.gitmodules
index 0b339593..cc8afdb5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,6 @@
 [submodule "puppet/modules/backupninja"]
 	path = puppet/modules/backupninja
 	url = https://leap.se/git/puppet_backupninja
+[submodule "puppet/modules/sysctl"]
+	path = puppet/modules/sysctl
+	url = https://leap.se/git/puppet_sysctl
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 33d3df05..d85d9c8f 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -12,7 +12,6 @@ class site_config::default {
 
   include site_config::slow
 
-
   include concat::setup
 
   # default class, used by all hosts
@@ -22,6 +21,9 @@ class site_config::default {
   # configure apt
   include site_apt
 
+  # configure sysctl parameters
+  include site_config::sysctl
+
   # configure ssh and include ssh-keys
   include site_config::sshd
 
diff --git a/puppet/modules/site_config/manifests/sysctl.pp b/puppet/modules/site_config/manifests/sysctl.pp
new file mode 100644
index 00000000..99f75123
--- /dev/null
+++ b/puppet/modules/site_config/manifests/sysctl.pp
@@ -0,0 +1,8 @@
+class site_config::sysctl {
+
+  sysctl::config {
+    'net.ipv4.ip_nonlocal_bind':
+      value   => 1,
+      comment => 'Allow applications to bind to an address when link is down (see https://leap.se/code/issues/4506)'
+  }
+}
diff --git a/puppet/modules/sysctl b/puppet/modules/sysctl
new file mode 160000
+Subproject 975852b7acc1125b4cd9d4d490b9abd8d31217e