Merge remote branch 'riseup/master'

6 files changed, 21 insertions, 5 deletions

diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 17387e8..7c2adc2 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,4 +1,5 @@
 class munin::client::base {
+
     service { 'munin-node':
         ensure => running,
         enable => true,
diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp
index 369a605..9cfe7e9 100644
--- a/manifests/client/darwin.pp
+++ b/manifests/client/darwin.pp
@@ -1,4 +1,5 @@
 class munin::client::darwin {
+
     file { "/usr/share/snmp/snmpd.conf":
         mode => 744,
         content => template("munin/darwin_snmpd.conf.erb"),
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index 9cc16db..60b496d 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -1,4 +1,5 @@
 class munin::client::debian inherits munin::client::package {
+
     # the plugin will need that
     if !defined(Package['iproute']) {
         package { "iproute": ensure => installed }
diff --git a/manifests/client/gentoo.pp b/manifests/client/gentoo.pp
index c24d317..d4fe71e 100644
--- a/manifests/client/gentoo.pp
+++ b/manifests/client/gentoo.pp
@@ -1,4 +1,5 @@
 class munin::client::gentoo inherits munin::client::package {
+
   Package['munin-node'] {
     name => 'munin',
     category => 'net-analyzer',
diff --git a/manifests/client/openbsd.pp b/manifests/client/openbsd.pp
index 7012c00..89b5752 100644
--- a/manifests/client/openbsd.pp
+++ b/manifests/client/openbsd.pp
@@ -1,6 +1,8 @@
 # currently we install munin on openbsd by targz
 # :(
+
 class munin::client::openbsd inherits munin::client::base {
+
     if $operatingsystemrelease == '4.3' {
       file{'/usr/src/munin_openbsd.tar.gz':
         source => "puppet:///modules/munin/openbsd/package/munin_openbsd.tar.gz",
diff --git a/manifests/client/package.pp b/manifests/client/package.pp
index 18566b8..29f256d 100644
--- a/manifests/client/package.pp
+++ b/manifests/client/package.pp
@@ -1,11 +1,21 @@
 class munin::client::package inherits munin::client::base {
-    package { 'munin-node': ensure => installed }
+
+  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],
+      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'],
+      # this has to be installed before the package, so the postinst can
+      # boot the munin-node without failure!
+      before => Package['munin-node'],
     }
 }
+