Remove roles for fuchur, glaedr, gorwen, idris and lockheed

[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..4f3580b563ba9e7a1eec94e333c6d8fdf43f39fb 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 *
@@ -35,9 +35,6 @@ allow ^127\.0\.0\.1$
 <% server.interfaces do |interface| -%>
 allow ^<%= Regexp.quote(interface[:address]) %>$
 <% end -%>
-<% if server[:openvpn] -%>
-allow ^<%= Regexp.quote(server[:openvpn][:address]) %>$
-<% end -%>
 <% end -%>
 <% node[:munin][:allow].each do |address| -%>
 allow ^<%= Regexp.quote(address) %>$