Include internal addresses in munin allow list

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index a54b387185fdde2a413b0db111b050cd29cde13c..9b2c6f294776195a57813c1841cba5eb7567f178 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -24,9 +24,7 @@ service "munin-node" do
   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

-servers = search(:node, "recipes:munin\\:\\:server").collect do |server|
-  server.ipaddresses(:role => :external)
-end.flatten
+servers = search(:node, "recipes:munin\\:\\:server").map(&:ipaddresses).flatten

 
 firewall_rule "accept-munin" do
   action :accept
 
 firewall_rule "accept-munin" do
   action :accept

diff --git a/cookbooks/munin/templates/default/munin-node.conf.erb b/cookbooks/munin/templates/default/munin-node.conf.erb
index f2e09d7e9cd61219d6997a34aef56e382be5f0e2..6bd38df19690ca22fdc8304bfac52323c8964fd9 100644 (file)
--- a/cookbooks/munin/templates/default/munin-node.conf.erb
+++ b/cookbooks/munin/templates/default/munin-node.conf.erb
@@ -31,7 +31,7 @@ port 4949
 
 # List the addresses that are allowed to connect
 allow ^127\.0\.0\.1$
 
 # List the addresses that are allowed to connect
 allow ^127\.0\.0\.1$

-<% @servers.each do |server| -%>
+<% @servers.sort.each do |server| -%>

 allow ^<%= Regexp.quote(server) %>$
 <% end -%>
 <% node[:munin][:allow].each do |address| -%>
 allow ^<%= Regexp.quote(server) %>$
 <% end -%>
 <% node[:munin][:allow].each do |address| -%>