Merge branch 'immerda/master'

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

1 files changed, 26 insertions, 24 deletions

diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 7c2adc2..78398a9 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,26 +1,28 @@
 class munin::client::base {
-
-    service { 'munin-node':
-        ensure => running,
-        enable => true,
-        hasstatus => true,
-        hasrestart => true,
-    }
-    file {'/etc/munin':
-        ensure => directory,
-        mode => 0755, owner => root, group => 0;
-    }
-    $real_munin_allow = $munin_allow ? {
-        '' => '127.0.0.1',
-        default => $munin_allow
-    }
-    file {'/etc/munin/munin-node.conf':
-        content => template("munin/munin-node.conf.$operatingsystem"),
-        notify => Service['munin-node'],
-        mode => 0644, owner => root, group => 0,
-    }
-    munin::register { $fqdn:
-        config => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'],
-    }
-    include munin::plugins::base
+  service { 'munin-node':
+    ensure => running,
+    enable => true,
+    hasstatus => true,
+    hasrestart => true,
+  }
+  file {'/etc/munin':
+    ensure => directory,
+    mode => 0755, owner => root, group => 0;
+  }
+  file {'/etc/munin/munin-node.conf':
+    content => template("munin/munin-node.conf.${::operatingsystem}"),
+    notify => Service['munin-node'],
+    mode => 0644, owner => root, group => 0,
+  }
+  munin::register { $::fqdn:
+    host       => $munin::client::host ? {
+      '*'      => $::fqdn,
+      default  => $munin::client::host
+    },
+    port       => $munin::client::port,
+    use_ssh    => $munin::client::use_ssh,
+    config     => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'],
+    export_tag => $munin::client::export_tag,
+  }
+  include munin::plugins::base
 }