X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/60ef68d5a680e8198874299a1685cb72430b9b49..52cbd01e53b20fcb0ef5226621c825807aaa9aaa:/cookbooks/munin/recipes/server.rb

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 4729f4321..c30078b82 100644
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -45,7 +45,7 @@ munin_plugin "rrdcached"
 
 expiry_time = 14 * 86400
 
-clients = search(:node, "recipes:munin").select { |n| n[:munin] }.sort_by { |n| n[:hostname] }
+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
 tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
@@ -81,6 +81,13 @@ apache_site "munin.openstreetmap.org" do
   template "apache.erb"
 end
 
+template "/etc/cron.daily/munin-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
 munin_plugin "munin_stats"
 munin_plugin "munin_update"
 munin_plugin "munin_rrdcached"