From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Jul 2015 07:27:06 +0000 (+0100)
Subject: Fix munin backup script
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2827bb4c1d2116657079719a078450513d647149?ds=sidebyside

Fix munin backup script
---

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 6d628bb8c..675454de4 100644
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -85,7 +85,7 @@ template "/etc/cron.daily/munin-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0755
 end
 
 munin_plugin "munin_stats"
diff --git a/cookbooks/munin/templates/default/backup.cron.erb b/cookbooks/munin/templates/default/backup.cron.erb
index 33ac59256..9ff94f2e0 100644
--- a/cookbooks/munin/templates/default/backup.cron.erb
+++ b/cookbooks/munin/templates/default/backup.cron.erb
@@ -6,10 +6,14 @@ T=$(mktemp -d -t -p /var/tmp munin.XXXXXXXXXX)
 D=$(date +%Y-%m-%d)
 B=munin-$D.tar.gz
 
+mkdir $T/munin-$D
+ln -s /var/lib/munin/openstreetmap $T/munin-$D
+ln -s /var/lib/munin/*.storable $T/munin-$D
+
 export GZIP="--rsyncable -9"
 export RSYNC_RSH="ssh -ax"
 
-nice tar --create --gzip --dereference --directory=/var/lib/munin --file=$T/$B openstreetmap *.storable
+nice tar --create --gzip --dereference --directory=$T --file=$T/$B munin-$D
 nice rsync $T/$B backup::backup
 
 rm -rf $T