Merge branch 'immerda/master'

Conflicts:
	files/plugins/xen-cpu
	templates/munin-node.conf.Debian.squeeze

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
 }