From: Tom Hughes <tom@compton.nu>
Date: Sat, 28 Sep 2013 09:28:03 +0000 (+0100)
Subject: Don't generate bogus address configurations for munin
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3190c464bc2e27816da4c90d6e212fb9e2a09d0e

Don't generate bogus address configurations for munin
---

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 9bceccd25..f204de2a0 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -20,7 +20,7 @@ unknown_limit 144
     address <%= client.internal_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "ic" -%>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
-<% else -%>
+<% elsif client.external_ipaddress -%>
     address <%= client.external_ipaddress %>
 <% end -%>
     use_node_name yes