Merge branch 'develop'

2 files changed, 18 insertions, 0 deletions

diff --git a/puppet/modules/sysctl b/puppet/modules/sysctl
deleted file mode 160000
-Subproject 975852b7acc1125b4cd9d4d490b9abd8d31217e
diff --git a/puppet/modules/sysctl/manifests/config.pp b/puppet/modules/sysctl/manifests/config.pp
new file mode 100644
index 00000000..79ddd295
--- /dev/null
+++ b/puppet/modules/sysctl/manifests/config.pp
@@ -0,0 +1,18 @@
+define sysctl::config ($value, $comment) {
+
+  include sysctl
+
+  augeas { "sysctl_${name}":
+    context => '/files/etc/sysctl.conf',
+    changes => [ "set ${name} ${value}", "insert #comment before ${name}",
+                 "set #comment[last()] '${comment}'" ],
+    onlyif  => "get ${name} != ${value}",
+    notify  => Exec["sysctl_${name}"],
+  }
+
+  exec { "sysctl_${name}":
+    command     => '/sbin/sysctl -p',
+    subscribe   => File['/etc/sysctl.conf'],
+    refreshonly => true,
+  }
+}