Merge branch 'immerda/master'

Conflicts:
	files/plugins/xen-cpu
	templates/munin-node.conf.Debian.squeeze

1 files changed, 59 insertions, 1 deletions

diff --git a/templates/munin-node.conf.OpenBSD b/templates/munin-node.conf.OpenBSD
index 082b30c..4e2f534 120000..100644
--- a/templates/munin-node.conf.OpenBSD
+++ b/templates/munin-node.conf.OpenBSD
@@ -1 +1,59 @@
-munin-node.conf.default
\ No newline at end of file
+##########
+########## 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
+setsid 1
+
+user root
+group 0
+
+# Regexps for files to ignore
+ignore_file ~$
+ignore_file DEADJOE$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+ignore_file \.pod$
+
+# 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.  This must be a
+# 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
+
+<% scope.lookupvar('munin::client::allow').each do |allow| -%>
+allow <%= "^#{Regexp.escape(allow)}$" %>
+<% end -%>
+
+# If you have installed the Net::CIDR perl module, you can use one or more
+# cidr_allow and cidr_deny address/mask patterns.  A connecting client must
+# match any cidr_allow, and not match any cidr_deny.  Note that a netmask
+# *must* be provided, even if it's /32
+#
+# 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 <%= scope.lookupvar('munin::client::host') %>
+# host 127.0.0.1
+
+# And which port
+port <%= scope.lookupvar('munin::client::port') %>
+