Allow munin-node to be per host

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/munin-node/files/common/munin-node.conf b/modules/munin-node/files/common/munin-node.conf
new file mode 100644 (file)
index 0000000..47ad47f
--- /dev/null
+++ b/modules/munin-node/files/common/munin-node.conf
@@ -0,0 +1,37 @@
+#
+# Example config-file for munin-node
+#
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+port 4949
+pid_file /var/run/munin/munin-node.pid
+background 1
+setseid 1
+
+# Which port to bind to;
+host *
+user root
+group root
+setsid yes
+
+# Regexps for files to ignore
+
+ignore_file ~$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+
+# Set this if the client doesn't report the correct hostname when
+# telnetting to localhost, port 4949
+#
+#host_name localhost.localdomain
+
+# A list of addresses that are allowed to connect.  This must be a
+# regular expression, due to brain damage in Net::Server, which
+# doesn't understand CIDR-style network notation.  You may repeat
+# the allow line as many times as you'd like
+
+allow ^192\.25\.206\.57$
+allow ^192\.25\.206\.33$

diff --git a/modules/munin-node/files/munin-node.conf b/modules/munin-node/files/munin-node.conf
deleted file mode 100644 (file)
index 47ad47f..0000000
--- a/modules/munin-node/files/munin-node.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Example config-file for munin-node
-#
-
-log_level 4
-log_file /var/log/munin/munin-node.log
-port 4949
-pid_file /var/run/munin/munin-node.pid
-background 1
-setseid 1
-
-# Which port to bind to;
-host *
-user root
-group root
-setsid yes
-
-# Regexps for files to ignore
-
-ignore_file ~$
-ignore_file \.bak$
-ignore_file %$
-ignore_file \.dpkg-(tmp|new|old|dist)$
-ignore_file \.rpm(save|new)$
-
-# Set this if the client doesn't report the correct hostname when
-# telnetting to localhost, port 4949
-#
-#host_name localhost.localdomain
-
-# A list of addresses that are allowed to connect.  This must be a
-# regular expression, due to brain damage in Net::Server, which
-# doesn't understand CIDR-style network notation.  You may repeat
-# the allow line as many times as you'd like
-
-allow ^192\.25\.206\.57$
-allow ^192\.25\.206\.33$

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 7f464ba7b69290954a78ca64686dd6773063fe14..7f1c1077feaaa5f138ff392b009bd1f70afc6a22 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -6,7 +6,8 @@ class munin-node {
         owner   => root,
         group   => root,
         mode    => 664,
-        source  => "puppet:///munin-node/munin-node.conf",
+        source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
+                     "puppet:///munin-node/common/munin-node.conf" ],
         require => Package["munin-node"],
         notify  => Exec["munin-node restart"],
     }