From acfaa47dbdb07805cb07eb72f552d0e9b03ba1c9 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Sat, 13 Dec 2014 11:21:09 -0500 Subject: create a single entry point to the module The current state of the module makes it impossible to install a munin server with munin::host, since it depends on resources in munin::client (because of the plugins it installs). Even if we include the munin::client class "just before" munin::host, puppet thinks there are dependency issues. By moving arguments to a single point of entry we can then include all necessary items and puppet will find the needed resources correctly. --- templates/munin-node.conf.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/munin-node.conf.erb') diff --git a/templates/munin-node.conf.erb b/templates/munin-node.conf.erb index b0c8fc8..f51a665 100644 --- a/templates/munin-node.conf.erb +++ b/templates/munin-node.conf.erb @@ -34,13 +34,13 @@ ignore_file \.pod$ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 # -host_name <%= scope.lookupvar('munin::client::host_name') %> +host_name <%= scope.lookupvar('munin::host_name') %> # 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 -<% scope.lookupvar('munin::client::allow').each do |allow| -%> +<% scope.lookupvar('munin::allow').each do |allow| -%> allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> @@ -56,7 +56,7 @@ allow <%= "^#{Regexp.escape(allow)}$" %> # cidr_deny 192.0.2.42/32 # Which address to bind to; -host <%= scope.lookupvar('munin::client::host') %> +host <%= scope.lookupvar('munin::host') %> # And which port -port <%= scope.lookupvar('munin::client::port') %> +port <%= scope.lookupvar('munin::port') %> -- cgit v1.2.3