From e6b6a712447882174b4d0a357218dfb1aaa7faca Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 5 Mar 2010 08:56:12 +0100
Subject: new upstream config

---
 templates/munin-node.conf.default | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index befcae4..afafa4b 100644
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -1,21 +1,25 @@
 ##########
 ########## Managed by puppet
 ##########
+#
+# Example config-file for munin-node
+#
 
 log_level 4
 log_file /var/log/munin/munin-node.log
 pid_file /var/run/munin/munin-node.pid
 
 background 1
-setseid 1
+setid 1
 
 user root
 group 0
-setsid yes
 
 # Regexps for files to ignore
 
 ignore_file ~$
+#ignore_file [#~]$  # FIX doesn't work. '#' starts a comment
+ignore_file DEADJOE$
 ignore_file \.bak$
 ignore_file %$
 ignore_file \.dpkg-(tmp|new|old|dist)$
@@ -29,14 +33,24 @@ ignore_file \.pod$
 host_name <%= fqdn %>
 
 # 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
+# regular expression, since Net::Server does not understand CIDR-style
+# network notation unless the perl module Net::CIDR is installed.  You
+# may repeat the allow line as many times as you'd like
 
 <% real_munin_allow.split(':').each do |val| -%>
 allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
 <% end -%>
 
+# If you have installed the Net::CIDR perl module, you can use
+# multiple cidr_allow and cidr_deny address/mask patterns.  A
+# connecting client must match any cidr_allow, and not match any
+# cidr_deny.  Example:
+
+# cidr_allow 127.0.0.1/32
+# cidr_allow 192.0.2.0/24
+# cidr_deny  192.0.2.42/32
+
+
 # Which address to bind to;
 host <%= munin_host_real %>
 # host 127.0.0.1
-- 
cgit v1.2.3


From 4a3d25e393b2be1bea0d11ddc456ed3a7457d267 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 25 Apr 2010 13:24:40 +0200
Subject: update to new name

---
 templates/munin-node.conf.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index afafa4b..e584df1 100644
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -10,7 +10,7 @@ log_file /var/log/munin/munin-node.log
 pid_file /var/run/munin/munin-node.pid
 
 background 1
-setid 1
+setsid 1
 
 user root
 group 0
-- 
cgit v1.2.3