Force Access-Control-Allow-Origin for taginfo api responses

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

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 1e51b4c4a14dccca4919a0212340d5f150549e5f..0c74cd0ccade90184f5124ef02f29fb71e22e1f3 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -20,6 +20,27 @@
 include_recipe "apache"
 
 package "munin"
+package "rrdcached"
+
+template "/etc/default/rrdcached" do
+  source "rrdcached.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+directory "/var/lib/munin/rrdcached" do
+  owner "munin"
+  group "munin"
+  mode 0755
+end
+
+service "rrdcached" do
+  action [ :enable, :start ]
+  subscribes :restart, "template[/etc/default/rrdcached]"
+end
+
+munin_plugin "rrdcached"
 
 expiry_time = 14 * 86400
 
@@ -29,13 +50,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