diff options
| author | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 09:34:56 -0500 |
|---|---|---|
| committer | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 10:21:25 -0500 |
| commit | 48272434978f95c70e34aebe9ce188157f8f935e (patch) | |
| tree | 8c940d891cbcba026d56cf8ed2935361debc44fd /manifests/client/debian.pp | |
| parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
| parent | 27c9a5dbc2083dcc20d059008702dd3f75382bcc (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/client/debian.pp')
| -rw-r--r-- | manifests/client/debian.pp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index e67ac26..49ee567 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,15 +1,9 @@ -class munin::client::debian inherits munin::client::package { +# Install the munin client on debian +class munin::client::debian inherits munin::client::base { # the plugin will need that - package { "iproute": ensure => installed } + ensure_packages(['iproute']) - Service["munin-node"]{ - # sarge's munin-node init script has no status - hasstatus => $::lsbdistcodename ? { sarge => false, default => true } - } - File["/etc/munin/munin-node.conf"]{ - content => template("munin/munin-node.conf.${::operatingsystem}.${::lsbdistcodename}"), - } # workaround bug in munin_node_configure - plugin { "postfix_mailvolume": ensure => absent } + plugin { 'postfix_mailvolume': ensure => absent } include munin::plugins::debian } |