Add new Amsterdam addresses to whitelists

[chef.git] / cookbooks / munin / templates / default / munin-node.conf.erb

diff --git a/cookbooks/munin/templates/default/munin-node.conf.erb b/cookbooks/munin/templates/default/munin-node.conf.erb
index 0ff07cb3c0f4a82051f59d6062ffe3e12977942f..6bd38df19690ca22fdc8304bfac52323c8964fd9 100644 (file)
--- a/cookbooks/munin/templates/default/munin-node.conf.erb
+++ b/cookbooks/munin/templates/default/munin-node.conf.erb
@@ -23,7 +23,7 @@ ignore_file \.rpm(save|new)$
 ignore_file \.pod$
 
 # Set the hostname
-host_name <%= node[:hostname] -%>.openstreetmap.org
+host_name <%= node.name %>
 
 # List on port 4949 on all interfaces
 host *
@@ -31,13 +31,8 @@ port 4949
 
 # List the addresses that are allowed to connect
 allow ^127\.0\.0\.1$
-<% @servers.each do |server| -%>
-<% server.interfaces do |interface| -%>
-allow ^<%= Regexp.quote(interface[:address]) %>$
-<% end -%>
-<% if server[:openvpn] -%>
-allow ^<%= Regexp.quote(server[:openvpn][:address]) %>$
-<% end -%>
+<% @servers.sort.each do |server| -%>
+allow ^<%= Regexp.quote(server) %>$
 <% end -%>
 <% node[:munin][:allow].each do |address| -%>
 allow ^<%= Regexp.quote(address) %>$