From 553fbe3e1d3c6865172c1db8cf93d69fb936dc18 Mon Sep 17 00:00:00 2001 From: Pascal Simon Date: Mon, 6 Dec 2010 15:51:05 +0100 Subject: update munin-node template --- templates/munin-node.conf.default | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index befcae4..85c0051 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -7,15 +7,16 @@ log_file /var/log/munin/munin-node.log pid_file /var/run/munin/munin-node.pid background 1 -setseid 1 +setsid 1 user root group 0 -setsid yes # Regexps for files to ignore ignore_file ~$ +#ignore_file [#~]$ # FIX doesn't work. '#' starts a comment +ignore_file DEADJOE$ ignore_file \.bak$ ignore_file %$ ignore_file \.dpkg-(tmp|new|old|dist)$ @@ -29,14 +30,23 @@ ignore_file \.pod$ 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 +# 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 <% real_munin_allow.split(':').each do |val| -%> allow <%= '^'+val.gsub(/\./, '\.')+'$' %> <% end -%> +# If you have installed the Net::CIDR perl module, you can use +# multiple cidr_allow and cidr_deny address/mask patterns. A +# connecting client must match any cidr_allow, and not match any +# cidr_deny. 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 <%= munin_host_real %> # host 127.0.0.1 -- cgit v1.2.3 From 9b161f0c61bbd30960e663eceef8f1b35f633507 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 5 Nov 2011 14:14:32 +0100 Subject: use hiera to configure munin node specific things --- templates/munin-node.conf.default | 8 ++++---- 1 file changed, 4 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 be62848..d67a9f8 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -37,8 +37,8 @@ host_name <%= fqdn %> # network notation unless the perl module Net::CIDR is installed. You # may repeat the allow line as many times as you'd like -<% real_munin_allow.split(':').each do |val| -%> -allow <%= '^'+val.gsub(/\./, '\.')+'$' %> +<% scope.function_hiera('munin_allow',['127.0.0.1']).each do |allow| -%> +allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> # If you have installed the Net::CIDR perl module, you can use @@ -51,9 +51,9 @@ allow <%= '^'+val.gsub(/\./, '\.')+'$' %> # cidr_deny 192.0.2.42/32 # Which address to bind to; -host <%= munin_host_real %> +host <%= scope.function_hiera('munin_host','*') %> # host 127.0.0.1 # And which port -port <%= munin_port_real %> +port <%= scope.function_hiera('munin_port','4949') %> -- cgit v1.2.3 From e710a3bfd1d24a9fa4fdb217609635fec616a6f7 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 29 Apr 2012 12:58:22 +0200 Subject: update config file to match upstream --- templates/munin-node.conf.default | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index d67a9f8..adc2408 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -41,11 +41,13 @@ host_name <%= fqdn %> allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> -# If you have installed the Net::CIDR perl module, you can use -# multiple cidr_allow and cidr_deny address/mask patterns. A -# connecting client must match any cidr_allow, and not match any -# cidr_deny. Example: - +# 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 -- cgit v1.2.3 From 64a6aa3cf73bdc9d75d34b6fbcd04f5e7f34e923 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 9 Jun 2012 21:17:47 -0300 Subject: use class parameters --- templates/munin-node.conf.default | 6 +++--- 1 file changed, 3 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 adc2408..9684bd5 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -37,7 +37,7 @@ host_name <%= fqdn %> # network notation unless the perl module Net::CIDR is installed. You # may repeat the allow line as many times as you'd like -<% scope.function_hiera('munin_allow',['127.0.0.1']).each do |allow| -%> +<% scope.lookupvar('munin::client::allow').each do |allow| -%> allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> @@ -53,9 +53,9 @@ allow <%= "^#{Regexp.escape(allow)}$" %> # cidr_deny 192.0.2.42/32 # Which address to bind to; -host <%= scope.function_hiera('munin_host','*') %> +host <%= scope.lookupvar('munin::client::host') %> # host 127.0.0.1 # And which port -port <%= scope.function_hiera('munin_port','4949') %> +port <%= scope.lookupvar('munin::client::port') %> -- cgit v1.2.3 From 17106c70cbf414ed54606b7a2f3bcc66cb36b9df Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 6 Dec 2012 21:42:51 +0100 Subject: update with latest upstream --- templates/munin-node.conf.default | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'templates/munin-node.conf.default') diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index 9684bd5..ff9fbb1 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -16,9 +16,7 @@ user root group 0 # Regexps for files to ignore - -ignore_file ~$ -#ignore_file [#~]$ # FIX doesn't work. '#' starts a comment +ignore_file [\#~]$ ignore_file DEADJOE$ ignore_file \.bak$ ignore_file %$ -- cgit v1.2.3 From 3dc03e88057890b5ef8dc02fde45b66bfd94cf73 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 7 Dec 2012 15:19:23 +0100 Subject: this does not yet work on the older munins --- 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 ff9fbb1..4e2f534 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -16,7 +16,7 @@ user root group 0 # Regexps for files to ignore -ignore_file [\#~]$ +ignore_file ~$ ignore_file DEADJOE$ ignore_file \.bak$ ignore_file %$ -- cgit v1.2.3 From 935752b577e9b02e6d08dee1d3b885cba8043466 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 12 Jan 2013 12:47:56 +0100 Subject: fix path for munin-log file --- 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 4e2f534..2a95fbc 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -6,7 +6,7 @@ # log_level 4 -log_file /var/log/munin/munin-node.log +log_file /var/log/munin-node/munin-node.log pid_file /var/run/munin/munin-node.pid background 1 -- cgit v1.2.3 From bee292c51a392fc36948862f88585d41aaf68c65 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 12 Jan 2013 12:50:43 +0100 Subject: update to latest upstream --- 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 2a95fbc..9d7f32f 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -16,7 +16,7 @@ user root group 0 # Regexps for files to ignore -ignore_file ~$ +ignore_file [\#~]$ ignore_file DEADJOE$ ignore_file \.bak$ ignore_file %$ -- cgit v1.2.3