summaryrefslogtreecommitdiff
path: root/manifests/plugins/setup.pp
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2014-12-13 09:34:56 -0500
committerGabriel Filion <gabster@lelutin.ca>2014-12-13 10:21:25 -0500
commit48272434978f95c70e34aebe9ce188157f8f935e (patch)
tree8c940d891cbcba026d56cf8ed2935361debc44fd /manifests/plugins/setup.pp
parent7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff)
parent27c9a5dbc2083dcc20d059008702dd3f75382bcc (diff)
Merge remote-tracking branch 'immerda/master' into merge_immerda
Conflicts: manifests/plugins/interfaces.pp $real_ifs was changed on master and we'd like to keep that change $ifs was changed to use the prefix() function and we'd like to keep that change.
Diffstat (limited to 'manifests/plugins/setup.pp')
-rw-r--r--manifests/plugins/setup.pp21
1 files changed, 4 insertions, 17 deletions
diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
index 197b657..a3f3b22 100644
--- a/manifests/plugins/setup.pp
+++ b/manifests/plugins/setup.pp
@@ -1,14 +1,13 @@
+# Set up the munin plugins for a node
class munin::plugins::setup {
- # This is required for the munin-node service and package requirements below.
- include munin::client
-
file {
[ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
- ignore => 'snmp_*',
ensure => directory,
+ require => Package['munin-node'],
+ ignore => 'snmp_*',
checksum => mtime,
- recurse => true,
+ recurse => true,
purge => true,
force => true,
notify => Service['munin-node'],
@@ -22,16 +21,4 @@ class munin::plugins::setup {
group => 0,
mode => '0640';
}
- case $::kernel {
- openbsd: {
- File['/etc/munin/plugin-conf.d/munin-node']{
- before => File['/var/run/munin'],
- }
- }
- default: {
- File['/etc/munin/plugin-conf.d/munin-node']{
- before => Package['munin-node'],
- }
- }
- }
}