Fix detection of munin clients

[chef.git] / cookbooks / munin / recipes / server.rb

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 983f92231adbb52672068dbd60b7374ba9b31664..c30078b82de100b15c6590ddd528fe3eebcb864f 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 
 package "munin"
 package "rrdcached"
+package "libcgi-fast-perl"
 
 template "/etc/default/rrdcached" do
   source "rrdcached.erb"
@@ -36,13 +37,15 @@ directory "/var/lib/munin/rrdcached" do
 end
 
 service "rrdcached" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   subscribes :restart, "template[/etc/default/rrdcached]"
 end
 
+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|
@@ -60,9 +63,31 @@ template "/etc/munin/munin.conf" do
   variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches, :renderers => renderers
 end
 
+apache_module "fcgid"
+apache_module "rewrite"
+
+remote_directory "/srv/munin.openstreetmap.org" do
+  source "www"
+  owner "root"
+  group "root"
+  mode 0755
+  files_owner "root"
+  files_group "root"
+  files_mode 0755
+  purge true
+end
+
 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"