Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/osqa/templates/default/backup.cron.erb b/cookbooks/osqa/templates/default/backup.cron.erb
index e9d0e7352a8ad1ca48bbe5cf6299ccb98449de0f..020a035497d6910ef7084151595cd514a03a32cf 100644 (file)
--- a/cookbooks/osqa/templates/default/backup.cron.erb
+++ b/cookbooks/osqa/templates/default/backup.cron.erb
@@ -12,10 +12,9 @@ chown <%= @user %> $T/osqa-$D
 sudo -u <%= @user %> pg_dump --format=custom --file=$T/<%= @name %>-$D/osqa.dmp <%= @database %>
 ln -s <%= @directory %>/upfiles $T/<%= @name %>-$D/upfiles
 
 sudo -u <%= @user %> pg_dump --format=custom --file=$T/<%= @name %>-$D/osqa.dmp <%= @database %>
 ln -s <%= @directory %>/upfiles $T/<%= @name %>-$D/upfiles
 

-export GZIP="--rsyncable -9"

 export RSYNC_RSH="ssh -ax"
 
 export RSYNC_RSH="ssh -ax"
 

-nice tar --create --gzip --dereference --directory=$T --file=$T/$B <%= @name %>-$D
-nice rsync $T/$B backup::backup
+nice tar --create --dereference --directory=$T <%= @name %>-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup

 
 rm -rf $T
 
 rm -rf $T