summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-03-30 13:32:54 +0100
committermh <mh@immerda.ch>2013-03-30 13:32:54 +0100
commit8ca2751bbb58358b7e1fb19d0e6e88b2b2654c26 (patch)
tree15f90d3497fcdcbda8460e19b82d6ecf850b5096 /templates
parentd7b7240acbd4bfd89beae245cc8da6d667c6dfff (diff)
migrate all templates to the parametrized classes style
Diffstat (limited to 'templates')
-rw-r--r--templates/munin-node.conf.Debian.etch2
-rw-r--r--templates/munin-node.conf.Debian.lenny10
-rw-r--r--templates/munin-node.conf.Debian.wheezy10
-rw-r--r--templates/munin-node.conf.OpenBSD2
-rw-r--r--templates/munin-node.conf.Ubuntu8
5 files changed, 16 insertions, 16 deletions
diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch
index 44638e7..9763772 100644
--- a/templates/munin-node.conf.Debian.etch
+++ b/templates/munin-node.conf.Debian.etch
@@ -27,7 +27,7 @@ ignore_file \.rpm(save|new)$
# 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, due to brain damage in Net::Server, which
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny
index 56da89d..9763772 100644
--- a/templates/munin-node.conf.Debian.lenny
+++ b/templates/munin-node.conf.Debian.lenny
@@ -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
@@ -27,13 +27,13 @@ ignore_file \.rpm(save|new)$
# 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, 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 -%>
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') %>
diff --git a/templates/munin-node.conf.OpenBSD b/templates/munin-node.conf.OpenBSD
index 4e2f534..14b658e 100644
--- a/templates/munin-node.conf.OpenBSD
+++ b/templates/munin-node.conf.OpenBSD
@@ -28,7 +28,7 @@ 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
diff --git a/templates/munin-node.conf.Ubuntu b/templates/munin-node.conf.Ubuntu
index 17162d8..9763772 100644
--- a/templates/munin-node.conf.Ubuntu
+++ b/templates/munin-node.conf.Ubuntu
@@ -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
@@ -27,13 +27,13 @@ ignore_file \.rpm(save|new)$
# 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, 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 -%>