From 0e61c02b2b7a460f26867f91051660fe6124517d Mon Sep 17 00:00:00 2001
From: david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>
Date: Tue, 7 Aug 2007 11:43:21 +0000
Subject: commit second half of wrong commit of r176

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@177 f03ff2f1-f02d-0410-970d-b9634babeaa1
---
 templates/munin-node.conf.Debian.etch | 37 +++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 templates/munin-node.conf.Debian.etch

(limited to 'templates/munin-node.conf.Debian.etch')

diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch
new file mode 100644
index 0000000..92a75a1
--- /dev/null
+++ b/templates/munin-node.conf.Debian.etch
@@ -0,0 +1,37 @@
+##########
+########## Managed by puppet
+##########
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+port <%= munin_port_real %>
+pid_file /var/run/munin/munin-node.pid
+background 1
+setseid 1
+
+# Which port to bind to;
+host <%= munin_host_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
+
+# 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
+
+host_name <%= fqdn %>
+allow <%= munin_allow %>
-- 
cgit v1.2.3


From b6e5123196bc8199a895e39a33ab62cf9c4ff236 Mon Sep 17 00:00:00 2001
From: david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>
Date: Wed, 8 Aug 2007 09:14:36 +0000
Subject: parameter order improvement

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@186 f03ff2f1-f02d-0410-970d-b9634babeaa1
---
 templates/munin-node.conf.Debian.etch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'templates/munin-node.conf.Debian.etch')

diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch
index 92a75a1..0673937 100644
--- a/templates/munin-node.conf.Debian.etch
+++ b/templates/munin-node.conf.Debian.etch
@@ -4,13 +4,13 @@
 
 log_level 4
 log_file /var/log/munin/munin-node.log
-port <%= munin_port_real %>
 pid_file /var/run/munin/munin-node.pid
 background 1
 setseid 1
 
-# Which port to bind to;
+# Which host/port to bind to;
 host <%= munin_host_real %>
+port <%= munin_port_real %>
 user root
 group root
 setsid yes
@@ -27,11 +27,10 @@ ignore_file \.rpm(save|new)$
 # telnetting to localhost, port 4949
 #
 #host_name localhost.localdomain
+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
-
-host_name <%= fqdn %>
 allow <%= munin_allow %>
-- 
cgit v1.2.3