Merge branch 'immerda/master'

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

1 files changed, 9 insertions, 18 deletions

diff --git a/manifests/client/package.pp b/manifests/client/package.pp
index 29f256d..206ccc8 100644
--- a/manifests/client/package.pp
+++ b/manifests/client/package.pp
@@ -1,21 +1,12 @@
 class munin::client::package inherits munin::client::base {
-
-  if $munin_node_ensure_version == '' { $munin_node_ensure_version = 'installed' }
-
-  if $operatingsystem == "Debian" and $lsbdistcodename != "lenny" {
-    package { 'munin-common':
-      before => Package['munin-node'],
-      ensure => $munin_node_ensure_version;
-    }
-  }      
-    package { 'munin-node': ensure => $munin_node_ensure_version }
-    Service['munin-node']{
-      require => Package[munin-node],
-    }
-    File['/etc/munin/munin-node.conf']{
-      # this has to be installed before the package, so the postinst can
-      # boot the munin-node without failure!
-      before => Package['munin-node'],
-    }
+  package { 'munin-node': ensure => installed }
+  Service['munin-node']{
+    require => Package[munin-node],
+  }
+  File['/etc/munin/munin-node.conf']{
+    # this has to be installed before the package, so the postinst can
+    # boot the munin-node without failure!
+    before => Package['munin-node'],
+  }
 }