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

3 files changed, 64 insertions, 0 deletions

diff --git a/files/facter/interfaces.rb b/files/facter/interfaces.rb
new file mode 100755
index 0000000..dc9e37c
--- /dev/null
+++ b/files/facter/interfaces.rb
@@ -0,0 +1,13 @@
+# return the set of active interfaces as an array
+Facter.add("interfaces") do
+	setcode do
+		`ip -o link show`.split(/\n/).collect do |line|
+			value = nil
+			matches = line.match(/^\d*: ([^:]*): <(.*,)?UP(,.*)?>/)
+			if !matches.nil?
+				value = matches[1]
+			end
+			value
+		end.compact.join(" ")
+	end
+end
diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb
new file mode 100644
index 0000000..063eafc
--- /dev/null
+++ b/templates/defaultclient.erb
@@ -0,0 +1,14 @@
+<%
+	# Downcase all information
+	dom = domain.downcase
+	host = hostname.downcase
+	fhost = fqdn.downcase
+	ip = Facter['ip']
+%>
+### This syntax can be extended, it might get better ...
+#+<%= dom %>
+#-<%= host %>=<%= fhost %>:load.load
+[<%= fhost %>] # linux box 
+	address <%= munin_host_real %>
+	port <%= munin_port_real %>
+	use_node_name yes
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 %>