X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8c80f28569d1852809e9d5d994bcce9142aa76b5..4d63db9cd58ab8b688309f83cda1abaf5eb7502b:/cookbooks/munin/recipes/server.rb diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 3b71eaf10..90d70d7b1 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -45,9 +45,9 @@ munin_plugin "rrdcached" expiry_time = 14 * 86400 -clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } -frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort -backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort +clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } # ~FC010 +frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010 +backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010 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 @@ -79,7 +79,7 @@ remote_directory "/srv/munin.openstreetmap.org" do mode 0755 files_owner "root" files_group "root" - files_mode 0755 + files_mode 0644 purge true end