X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/956628583e0c73dc82b457cd83cbc5013b9cfd19..6e1a30e28068b34daa9715bd49c93b6a759feff0:/cookbooks/munin/templates/default/munin.conf.erb

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 9bceccd25..7175d6866 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -1,5 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+# Set maximum number of update processes to run at once
+max_processes 64
+
+# Use rrdcached
+rrdcached_socket /var/run/rrdcached.sock
+
 # Configure alert targets
 contact.admins.command mail -s "Munin Notification" admins@openstreetmap.org
 contact.null.command cat > /dev/null
@@ -17,10 +23,10 @@ unknown_limit 144
     update no
 <% end -%>
 <% if client[:networking][:roles][:external][:zone] == "ucl" -%>
-    address <%= client.internal_ipaddress %>
+    address <%= client.internal_ipaddress || client.external_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