diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/munin-node.conf.Debian.etch | 8 | ||||
-rw-r--r-- | templates/munin-node.conf.default | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch index 56da89d..17162d8 100644 --- a/templates/munin-node.conf.Debian.etch +++ b/templates/munin-node.conf.Debian.etch @@ -9,8 +9,8 @@ background 1 setseid 1 # Which host/port to bind to; -host <%= munin_host_real %> -port <%= munin_port_real %> +host <%= scope.function_hiera('munin_host','*') %> +port <%= scope.function_hiera('munin_port','4949') %> user root group root setsid yes @@ -33,7 +33,7 @@ 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(/\./, '\.')+'$' %> +<% scope.function_hiera('munin_allow',['127.0.0.1']).each do |allow| -%> +allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> 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') %> |