From 8ca2751bbb58358b7e1fb19d0e6e88b2b2654c26 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 30 Mar 2013 13:32:54 +0100 Subject: migrate all templates to the parametrized classes style --- templates/munin-node.conf.Debian.wheezy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'templates/munin-node.conf.Debian.wheezy') diff --git a/templates/munin-node.conf.Debian.wheezy b/templates/munin-node.conf.Debian.wheezy index 2b5d41f..fe6f27f 100644 --- a/templates/munin-node.conf.Debian.wheezy +++ b/templates/munin-node.conf.Debian.wheezy @@ -27,15 +27,15 @@ ignore_file \.pod$ # telnetting to localhost, port 4949 # #host_name localhost.localdomain -host_name <%= fqdn %> +host_name <%= scope.lookupvar('::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 -<% real_munin_allow.split(':').each do |val| -%> -allow <%= '^'+val.gsub(/\./, '\.')+'$' %> +<% 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 @@ -50,8 +50,8 @@ allow <%= '^'+val.gsub(/\./, '\.')+'$' %> # cidr_deny 192.0.2.42/32 # Which address to bind to; -host <%= munin_host_real %> +host <%= scope.lookupvar('munin::client::host') %> # And which port -port <%= munin_port_real %> +port <%= scope.lookupvar('munin::client::port') %> -- cgit v1.2.3