X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..7f5c025954a0868b7ac2aea8722089e75c39668e:/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 0ff07cb3c..4f3580b56 100644
--- 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) %>$