Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/chef/templates/default/server-backup.cron.erb b/cookbooks/chef/templates/default/server-backup.cron.erb
index 3b7e953e714ca1c8737e70291d24178879fff2d5..04e6c0e0c2363c1e0d61ad43f8b1dcd2d3da0fb9 100644 (file)
--- a/cookbooks/chef/templates/default/server-backup.cron.erb
+++ b/cookbooks/chef/templates/default/server-backup.cron.erb
@@ -7,12 +7,10 @@ B=chef-server-$D.tar.gz
 mkdir $T/chef-server-$D
 chgrp opscode-pgsql $T $T/chef-server-$D
 chmod g+rwx $T $T/chef-server-$D
-sudo -u opscode-pgsql /opt/chef-server/embedded/bin/pg_dump --file=$T/chef-server-$D/chef.dmp --clean opscode_chef
-ln -s /var/opt/chef-server/bookshelf/data $T/chef-server-$D/bookshelf
+sudo -u opscode-pgsql /opt/opscode/embedded/bin/pg_dumpall --file=$T/chef-server-$D/chef.dmp --clean
+ln -s /var/opt/opscode/bookshelf/data $T/chef-server-$D/bookshelf
 
-export GZIP="--rsyncable -9"
-
-nice tar --create --gzip --dereference --directory=$T --file=$T/$B chef-server-$D
-nice rsync $T/$B backup::backup
+nice tar --create --dereference --directory=$T chef-server-$D | nice gzip --rsyncable -9 > $T/$B
+nice rsync --preallocate --fuzzy $T/$B backup::backup
 
 rm -rf $T