Enhanced munin_node definition

1 files changed, 17 insertions, 4 deletions

diff --git a/manifests/munin.pp b/manifests/munin.pp
index 1795226..f0dac88 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,6 +1,19 @@
-# Define a munin node with custom port
-define munin_node($id) {
-  # Use one port for each node
-  $munin_port = "49$id"
+# Define a munin node
+define munin_node($port = '4949') {
+
+  case $global_munin_allow {
+    '': { fail("Please set \$global_munin_allow in your site config") }
+  }
+
+  $munin_allow = $node_munin_allow ? {
+    ''      => $global_munin_allow,
+    default => $node_munin_allow,
+  }
+
+  $munin_port = $node_munin_port ? {
+    ''      => $port
+    default => $node_munin_port,
+  }
+
   include munin::client
 }