X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin.conf-per-node.erb;h=421d0dd611f62c687bec45ca5e11c8fd67d845ee;hb=4326b0a78553bfe9696c10f1a69e1316acd23802;hp=c7f39b625f8179bb1bbc26394bb03da3b8e224d0;hpb=0ad5c1956a6e44f1d7ef04641a6fa0b03a6bec34;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/templates/munin.conf-per-node.erb b/modules/munin/templates/munin.conf-per-node.erb
index c7f39b625..421d0dd61 100644
--- a/modules/munin/templates/munin.conf-per-node.erb
+++ b/modules/munin/templates/munin.conf-per-node.erb
@@ -3,7 +3,12 @@
 ##
 
 [<%= client_fqdn %>]
-<%- if has_variable?('client_munin_async') and client_munin_async and client_munin_async == "true" %>
+<%
+# variables are different whether or not they go via the stored config thing.
+#  on the host that actually gets the config, client_munin_async is a String, saying "true",
+#  from other hosts it's an actual boolean, i.e. an instance of either FalseClass or TrueClass
+%>
+<%- if has_variable?('client_munin_async') and ((client_munin_async.kind_of?(String) and client_munin_async == "true") or (client_munin_async.kind_of?(TrueClass))) %>
     address ssh://munin-async@<%= client_fqdn %>/set-in-authkeys
 <%- else %>
     address <%= client_ipaddress %>