Update CiviCRM to 4.6.26

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

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index a03b7d684a7321f6326656761119889c5f5aa840..d4f8cb04703645c4f2502c684a0ecb10febee76d 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -81,7 +81,13 @@ remote_directory "/srv/munin.openstreetmap.org" do
   files_owner "root"
   files_group "root"
   files_mode 0o644
   files_owner "root"
   files_group "root"
   files_mode 0o644

-  purge true
+end
+
+# directory to put dumped files in
+directory "/srv/munin.openstreetmap.org/dumps" do
+  owner "www-data"
+  group "www-data"
+  mode 0o755

 end
 
 apache_site "munin.openstreetmap.org" do
 end
 
 apache_site "munin.openstreetmap.org" do


@@ -95,6 +101,21 @@ template "/etc/cron.daily/munin-backup" do
   mode 0o755
 end
 
   mode 0o755
 end
 

+# simple shell script to dump RRD data to a file
+cookbook_file "/usr/local/bin/rrddump" do
+  source "rrddump.sh"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+template "/etc/cron.d/rrddump" do
+  source "rrddump.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+

 munin_plugin "munin_stats"
 munin_plugin "munin_update"
 munin_plugin "munin_rrdcached"
 munin_plugin "munin_stats"
 munin_plugin "munin_update"
 munin_plugin "munin_rrdcached"