X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..8ed258cb682368870b36f0e0d08d5e1906f71473:/cookbooks/munin/recipes/server.rb?ds=sidebyside diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 1e51b4c4a..ed7aeac44 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -29,13 +29,16 @@ backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Tim tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] } end +renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| + { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] } +end template "/etc/munin/munin.conf" do source "munin.conf.erb" owner "root" group "root" mode 0644 - variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches + variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches, :renderers => renderers end apache_site "munin.openstreetmap.org" do