diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/client.erb | 8 | ||||
| -rw-r--r-- | templates/munin-node.conf.Debian.etch | 6 | ||||
| -rw-r--r-- | templates/munin-node.conf.default | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/templates/client.erb b/templates/client.erb index 8c93cc5..7131ade 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -1,19 +1,19 @@ <% # Downcase all information dom = scope.lookupvar('::domain').downcase - host = scope.lookupvar('::hostname').downcase + h = scope.lookupvar('::hostname').downcase %> ### Munin client from Puppet template # Domain: <%= dom %> -# Registered on: <%= host %> +# Registered on: <%= h %> # Type: <%= client_type %> <% if description != 'absent' -%> # Description: <%= description.gsub!(/\n/, ' ') %> <% end -%> [<%= fhost.downcase %>] - address <%= munin_host_real %> - port <%= munin_port_real %> + address <%= host %> + port <%= port %> <% if config -%><% config.each do |val| -%> <%= val -%> <% end -%><% end -%> diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch index 17162d8..44638e7 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 <%= scope.function_hiera('munin_host','*') %> -port <%= scope.function_hiera('munin_port','4949') %> +host <%= scope.lookupvar('munin::client::host') %> +port <%= scope.lookupvar('munin::client::port') %> 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 -<% 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 -%> 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') %> |