diff options
| author | mh <mh@immerda.ch> | 2011-11-05 14:14:32 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-11-05 14:14:32 +0100 |
| commit | 9b161f0c61bbd30960e663eceef8f1b35f633507 (patch) | |
| tree | 340e8f17084fc4b71478fb9b098f8d964d8fa62d /templates/munin-node.conf.Debian.etch | |
| parent | 33380e238f3ac37ac79f30485fdebbc5dd10170b (diff) | |
use hiera to configure munin node specific things
Diffstat (limited to 'templates/munin-node.conf.Debian.etch')
| -rw-r--r-- | templates/munin-node.conf.Debian.etch | 8 |
1 files changed, 4 insertions, 4 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 -%> |