summaryrefslogtreecommitdiff
path: root/manifests/plugins/setup.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-17 16:36:37 -0400
committerMicah Anderson <micah@riseup.net>2013-04-17 16:36:37 -0400
commit8f7c0071eb82591477876eeb3f309067853a3261 (patch)
treeb095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /manifests/plugins/setup.pp
parentea31faee76141646c173d88bd5bec5aa4a773c1c (diff)
parenta5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff)
Merge branch 'master' into leap
Conflicts: README manifests/host/cgi.pp
Diffstat (limited to 'manifests/plugins/setup.pp')
-rw-r--r--manifests/plugins/setup.pp30
1 files changed, 20 insertions, 10 deletions
diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
index c2c5ed3..197b657 100644
--- a/manifests/plugins/setup.pp
+++ b/manifests/plugins/setup.pp
@@ -1,18 +1,28 @@
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' ]:
- source => "puppet:///modules/common/empty",
- ignore => [ '.ignore', 'snmp_*' ],
- ensure => directory, checksum => mtime,
- recurse => true, purge => true, force => true,
- mode => 0755, owner => root, group => 0,
- notify => Service['munin-node'];
+ ignore => 'snmp_*',
+ ensure => directory,
+ checksum => mtime,
+ recurse => true,
+ purge => true,
+ force => true,
+ notify => Service['munin-node'],
+ owner => root,
+ group => 0,
+ mode => '0755';
'/etc/munin/plugin-conf.d/munin-node':
- ensure => present,
- mode => 0644, owner => root, group => 0,
- notify => Service['munin-node'],
+ ensure => present,
+ notify => Service['munin-node'],
+ owner => root,
+ group => 0,
+ mode => '0640';
}
- case $kernel {
+ case $::kernel {
openbsd: {
File['/etc/munin/plugin-conf.d/munin-node']{
before => File['/var/run/munin'],