summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-12-17 15:37:50 -0500
committerMicah Anderson <micah@riseup.net>2013-12-17 15:37:50 -0500
commit975852b7acc1125b4cd9d4d490b9abd8d31217e6 (patch)
tree479d769f1a80be838996d7a7694957936b1da44b
parent52b8ad1ff1d6479e7b0cb6bea8ca7fb853f1b14c (diff)
lint moduleHEADmaster
place sysctl::config in its own file for autoloading purposes
-rw-r--r--manifests/config.pp18
-rw-r--r--manifests/init.pp30
2 files changed, 24 insertions, 24 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
new file mode 100644
index 0000000..79ddd29
--- /dev/null
+++ b/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,
+ }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index e7492ab..43d9299 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,28 +1,10 @@
class sysctl {
- file { "/etc/sysctl.conf":
- mode => 644,
- owner => root,
- group => root,
- ensure => present,
- }
-}
-
-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,
+ file { '/etc/sysctl.conf':
+ ensure => present,
+ mode => '0644',
+ owner => root,
+ group => root
}
}
+