diff options
| author | micah <micah@muck.riseup.net> | 2013-03-20 18:25:28 -0400 |
|---|---|---|
| committer | micah <micah@muck.riseup.net> | 2013-03-20 18:25:28 -0400 |
| commit | c9748747c5c755443d80445a9a6c3f5d2ab3bc7f (patch) | |
| tree | 65887003b9bceefd7a6ba3e3692b9a6f08373304 /templates/munin-node.conf.Debian.etch | |
| parent | 149a78e7a8465da97f8ea267cd6a75e3bcdefe4d (diff) | |
| parent | f79f662bedbbd75c7e2022da282ba48c1b323e90 (diff) | |
Merge branch 'immerda/master'
Conflicts:
files/plugins/xen-cpu
templates/munin-node.conf.Debian.squeeze
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..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 <%= munin_host_real %> -port <%= munin_port_real %> +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 -<% real_munin_allow.split(':').each do |val| -%> -allow <%= '^'+val.gsub(/\./, '\.')+'$' %> +<% scope.lookupvar('munin::client::allow').each do |allow| -%> +allow <%= "^#{Regexp.escape(allow)}$" %> <% end -%> |