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