diff options
| -rw-r--r-- | manifests/client.pp | 6 | ||||
| -rw-r--r-- | templates/munin-node.conf.Debian.etch | 6 | ||||
| -rw-r--r-- | templates/munin-node.conf.default | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 5080f99..79d275e 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -3,7 +3,11 @@ # See LICENSE for the full license granted to you. # Adapted and improved by admin(at)immerda.ch -class munin::client { +class munin::client( + $allow = hiera('munin_client_allow',['127.0.0.1']), + $host = hiera('munin_host','*'), + $port = hiera('munin_port','4949') +) { case $::operatingsystem { openbsd: { include munin::client::openbsd } darwin: { include munin::client::darwin } 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') %> |