From 255ea623b2444ea46e10d36303a8de47c98a8b55 Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 7 Dec 2007 10:52:18 +0000 Subject: templates neu --- templates/munin-node.conf.default | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 templates/munin-node.conf.default (limited to 'templates/munin-node.conf.default') 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 %> + -- cgit v1.2.3 From 805d56cac760f6d047b83c470c080bee3342165f Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 13 Jun 2008 20:02:35 +0000 Subject: Merge commit 'puzzle/development' --- templates/munin-node.conf.default | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index f10349e..5eed749 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -33,7 +33,6 @@ 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 ^127\.0\.0\.1$ -allow <%= munin_allow1 %> -allow <%= munin_allow2 %> - +<% real_munin_allow.split(':').each do |val| -%> +allow <%= '^'+val.gsub(/\./, '\.')+'$' %> +<% end -%> -- cgit v1.2.3 From b7e757f96c1efd690e531c4c91e969867a2ebc91 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 1 Oct 2008 21:12:17 +0000 Subject: openbsd doesn't have a group root, so we just use the gid --- templates/munin-node.conf.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index 5eed749..47e391d 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -12,7 +12,7 @@ setseid 1 host <%= munin_host_real %> port <%= munin_port_real %> user root -group root +group 0 setsid yes # Regexps for files to ignore -- cgit v1.2.3 From 35c263f5ded3fbbc62b7496ddbc46a4cc11559f6 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 5 Apr 2009 12:01:21 +0000 Subject: updated to new version --- templates/munin-node.conf.default | 1 + 1 file changed, 1 insertion(+) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index 47e391d..c848f3d 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -22,6 +22,7 @@ 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 -- cgit v1.2.3 From 3b784f08508a2fdfa6fbb988c5cb4891bff5df10 Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Mon, 11 May 2009 12:44:17 +0200 Subject: updated munin-node config to latest version --- templates/munin-node.conf.default | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index c848f3d..befcae4 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -5,12 +5,10 @@ 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 0 setsid yes @@ -34,6 +32,15 @@ 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 + <% real_munin_allow.split(':').each do |val| -%> allow <%= '^'+val.gsub(/\./, '\.')+'$' %> <% end -%> + +# Which address to bind to; +host <%= munin_host_real %> +# host 127.0.0.1 + +# And which port +port <%= munin_port_real %> + -- cgit v1.2.3