summaryrefslogtreecommitdiff
path: root/manifests/client/debian.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/client/debian.pp
parentea31faee76141646c173d88bd5bec5aa4a773c1c (diff)
parenta5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff)
Merge branch 'master' into leap
Conflicts: README manifests/host/cgi.pp
Diffstat (limited to 'manifests/client/debian.pp')
-rw-r--r--manifests/client/debian.pp27
1 files changed, 12 insertions, 15 deletions
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index 60b496d..e67ac26 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -1,18 +1,15 @@
class munin::client::debian inherits munin::client::package {
+ # the plugin will need that
+ package { "iproute": ensure => installed }
- # the plugin will need that
- if !defined(Package['iproute']) {
- package { "iproute": ensure => installed }
- }
-
- 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 }
- include munin::plugins::debian
+ 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 }
+ include munin::plugins::debian
}