From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 31 May 2013 15:23:53 +0000 (+0200)
Subject: Revert "disable munin-async for now"
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a40e6b85fc16fe4765157788684f0c9d1f79dbc8

Revert "disable munin-async for now"

This reverts commit 2249c6494b112b3ee85c099122534e7e8d2b48e2.
---

diff --git a/modules/munin/templates/munin.conf-per-node.erb b/modules/munin/templates/munin.conf-per-node.erb
index d2a23e8b..421d0dd6 100644
--- a/modules/munin/templates/munin.conf-per-node.erb
+++ b/modules/munin/templates/munin.conf-per-node.erb
@@ -9,8 +9,7 @@
 #  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
-    address <%= client_ipaddress %>
+    address ssh://munin-async@<%= client_fqdn %>/set-in-authkeys
 <%- else %>
     address <%= client_ipaddress %>
 <%- end %>