From c0abb341bfdd1061c85d0349b9a880de6047728f Mon Sep 17 00:00:00 2001
From: David Schmitt <david@schmitt.edv-bus.at>
Date: Wed, 3 Jun 2009 11:11:45 +0200
Subject: use cidr_allow in lenny and newer

This change keeps munin_allow for etch and feisty, since I don't know whether
cidr_allow is already possible there. Everyone else should change to the much
nicer CIDR notation of cidr_allow.

You can use an array to specify multiple rules.
---
 templates/munin-node.conf.Debian.lenny   | 44 +++++++++++++++++++++++++++++++-
 templates/munin-node.conf.Debian.sid     |  2 +-
 templates/munin-node.conf.Debian.squeeze |  1 +
 3 files changed, 45 insertions(+), 2 deletions(-)
 mode change 120000 => 100644 templates/munin-node.conf.Debian.lenny
 create mode 120000 templates/munin-node.conf.Debian.squeeze

(limited to 'templates')

diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny
deleted file mode 120000
index e0646b9..0000000
--- a/templates/munin-node.conf.Debian.lenny
+++ /dev/null
@@ -1 +0,0 @@
-munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny
new file mode 100644
index 0000000..07f4980
--- /dev/null
+++ b/templates/munin-node.conf.Debian.lenny
@@ -0,0 +1,43 @@
+##########
+########## 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
-- 
cgit v1.2.3