summaryrefslogtreecommitdiff
path: root/templates/munin-node.conf.Debian.wheezy
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-17 16:36:37 -0400
committerMicah Anderson <micah@riseup.net>2013-04-17 16:36:37 -0400
commit8f7c0071eb82591477876eeb3f309067853a3261 (patch)
treeb095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /templates/munin-node.conf.Debian.wheezy
parentea31faee76141646c173d88bd5bec5aa4a773c1c (diff)
parenta5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff)
Merge branch 'master' into leap
Conflicts: README manifests/host/cgi.pp
Diffstat (limited to 'templates/munin-node.conf.Debian.wheezy')
-rw-r--r--templates/munin-node.conf.Debian.wheezy10
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/munin-node.conf.Debian.wheezy b/templates/munin-node.conf.Debian.wheezy
index 2b5d41f..fe6f27f 100644
--- a/templates/munin-node.conf.Debian.wheezy
+++ b/templates/munin-node.conf.Debian.wheezy
@@ -27,15 +27,15 @@ ignore_file \.pod$
# telnetting to localhost, port 4949
#
#host_name localhost.localdomain
-host_name <%= fqdn %>
+host_name <%= scope.lookupvar('::fqdn') %>
# 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
-<% real_munin_allow.split(':').each do |val| -%>
-allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
+<% scope.lookupvar('munin::client::allow').each do |allow| -%>
+allow <%= "^#{Regexp.escape(allow)}$" %>
<% end -%>
# If you have installed the Net::CIDR perl module, you can use one or more
@@ -50,8 +50,8 @@ allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
# cidr_deny 192.0.2.42/32
# Which address to bind to;
-host <%= munin_host_real %>
+host <%= scope.lookupvar('munin::client::host') %>
# And which port
-port <%= munin_port_real %>
+port <%= scope.lookupvar('munin::client::port') %>