merged immerda

9 files changed, 49 insertions, 2 deletions

diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb
index 954a0cb..5611bf4 100644
--- a/templates/defaultclient.erb
+++ b/templates/defaultclient.erb
@@ -11,4 +11,5 @@
 	address <%= munin_host_real %>
 	port <%= munin_port_real %>
 	use_node_name yes
-	exim_mailstats.graph_period minute
+    load.load.warning 5
+    load.load.critical 10
diff --git a/templates/munin-node.conf.CentOS b/templates/munin-node.conf.CentOS
new file mode 120000
index 0000000..082b30c
--- /dev/null
+++ b/templates/munin-node.conf.CentOS
@@ -0,0 +1 @@
+munin-node.conf.default
\ No newline at end of file
diff --git a/templates/munin-node.conf.CentOS. b/templates/munin-node.conf.CentOS.
new file mode 120000
index 0000000..082b30c
--- /dev/null
+++ b/templates/munin-node.conf.CentOS.
@@ -0,0 +1 @@
+munin-node.conf.default
\ No newline at end of file
diff --git a/templates/munin-node.conf.CentOS.5 b/templates/munin-node.conf.CentOS.5
new file mode 120000
index 0000000..082b30c
--- /dev/null
+++ b/templates/munin-node.conf.CentOS.5
@@ -0,0 +1 @@
+munin-node.conf.default
\ No newline at end of file
diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch
index 0673937..0f0f568 100644
--- a/templates/munin-node.conf.Debian.etch
+++ b/templates/munin-node.conf.Debian.etch
@@ -33,4 +33,5 @@ host_name <%= fqdn %>
 # 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
-allow <%= munin_allow %>
+allow <%= munin_allow1 %>
+allow <%= munin_allow2 %>
diff --git a/templates/munin-node.conf.Debian.gutsy b/templates/munin-node.conf.Debian.gutsy
new file mode 120000
index 0000000..e0646b9
--- /dev/null
+++ b/templates/munin-node.conf.Debian.gutsy
@@ -0,0 +1 @@
+munin-node.conf.Debian.etch
\ No newline at end of file
diff --git a/templates/munin-node.conf.Gentoo b/templates/munin-node.conf.Gentoo
new file mode 120000
index 0000000..082b30c
--- /dev/null
+++ b/templates/munin-node.conf.Gentoo
@@ -0,0 +1 @@
+munin-node.conf.default
\ No newline at end of file
diff --git a/templates/munin-node.conf.Gentoo. b/templates/munin-node.conf.Gentoo.
new file mode 120000
index 0000000..fd16e50
--- /dev/null
+++ b/templates/munin-node.conf.Gentoo.
@@ -0,0 +1 @@
+munin-node.conf.Gentoo
\ No newline at end of file
diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
new file mode 100644
index 0000000..f10349e
--- /dev/null
+++ b/templates/munin-node.conf.default
@@ -0,0 +1,39 @@
+##########
+########## 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.  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
+allow ^127\.0\.0\.1$
+allow <%= munin_allow1 %>
+allow <%= munin_allow2 %>
+