Make munin work for internal network machines in Dublin

[chef.git] / cookbooks / munin / templates / default / backup.cron.erb

diff --git a/cookbooks/munin/templates/default/backup.cron.erb b/cookbooks/munin/templates/default/backup.cron.erb
index 80e78c43f70eff50855a48b1fa9a41d955c91aed..13d4228cecb3bab14b035acffbaf2880f16ec853 100644 (file)
--- a/cookbooks/munin/templates/default/backup.cron.erb
+++ b/cookbooks/munin/templates/default/backup.cron.erb
@@ -6,10 +6,13 @@ T=$(mktemp -d -t -p /var/tmp munin.XXXXXXXXXX)
 D=$(date +%Y-%m-%d)
 B=munin-$D.tar.gz
 
-export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+mkdir $T/munin-$D
+ln -s /var/lib/munin/openstreetmap $T/munin-$D
+ln -s /var/lib/munin/*.storable $T/munin-$D
 
-nice tar --create --gzip --dereference --directory=/var/lib/munin --file=$T/$B openstreetmap *.storable
-nice rsync $T/$B backup::backup
+export RSYNC_RSH="ssh -ax"
+
+nice tar --create --dereference --directory=$T --warning=no-file-removed munin-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup
 
 rm -rf $T