summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README8
-rw-r--r--[l---------]templates/munin-node.conf.Debian.lenny44
l---------templates/munin-node.conf.Debian.sid2
l---------templates/munin-node.conf.Debian.squeeze1
4 files changed, 52 insertions, 3 deletions
diff --git a/README b/README
index 18cfa0a..8352db0 100644
--- a/README
+++ b/README
@@ -44,7 +44,13 @@ To use this module, follow these directions:
d. Add to the top of your site.pp a variable which indicates what IP should be allowed to
connect to your individual munin-nodes (this is typically your main munin host's IP):
- $munin_allow = '192.168.0.1'
+ $munin_cidr_allow = '192.168.0.1/32'
+
+ You can also put an array there.
+
+ On pre-lenny systems, you have to use the older Regexp-variant:
+
+ $munin_allow = '^192\.168\.0\.1$'
e. In the node definition in your site.pp for your main munin host, add the following:
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny
index e0646b9..07f4980 120000..100644
--- a/templates/munin-node.conf.Debian.lenny
+++ b/templates/munin-node.conf.Debian.lenny
@@ -1 +1,43 @@
-munin-node.conf.Debian.etch \ No newline at end of file
+##########
+########## Managed by puppet
+##########
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /var/run/munin/munin-node.pid
+background 1
+setseid 1
+
+# Which host/port to bind to;
+host <%= munin_host_real %>
+port <%= munin_port_real %>
+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
+host_name <%= fqdn %>
+
+# A list of addresses that are allowed to connect.
+<%
+if ! munin_cidr_allow.is_a?(Array) then
+ allows = [ munin_cidr_allow ]
+else
+ allows = munin_cidr_allow
+end
+
+allows.each do |cidr|
+-%>
+cidr_allow <%= cidr %>
+<% end -%>
diff --git a/templates/munin-node.conf.Debian.sid b/templates/munin-node.conf.Debian.sid
index e0646b9..6b8d690 120000
--- a/templates/munin-node.conf.Debian.sid
+++ b/templates/munin-node.conf.Debian.sid
@@ -1 +1 @@
-munin-node.conf.Debian.etch \ No newline at end of file
+munin-node.conf.Debian.lenny \ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.squeeze b/templates/munin-node.conf.Debian.squeeze
new file mode 120000
index 0000000..6b8d690
--- /dev/null
+++ b/templates/munin-node.conf.Debian.squeeze
@@ -0,0 +1 @@
+munin-node.conf.Debian.lenny \ No newline at end of file