Only sync the database backup if pg_dump succeeds

diff --git a/cookbooks/db/templates/default/backup-db.erb b/cookbooks/db/templates/default/backup-db.erb
index 492dded40be76318cc17b0612f4275237965834b..78ae1c8f75f9f1f6df17a4778a166b63dc494b3b 100644 (file)
--- a/cookbooks/db/templates/default/backup-db.erb
+++ b/cookbooks/db/templates/default/backup-db.erb
@@ -5,9 +5,7 @@
 D=`date +%Y-%m-%d`
 F=/store/backup/osm-${D}.dmp
 
 D=`date +%Y-%m-%d`
 F=/store/backup/osm-${D}.dmp
 

-pg_dump --user=backup --format=custom --file=$F openstreetmap
-
-export RSYNC_RSH="ssh -ax"
-rsync $F backup.openstreetmap.org::backup
+pg_dump --user=backup --format=custom --file=$F openstreetmap && \
+  rsync --rsh="ssh -ax" $F backup.openstreetmap.org::backup

 
 rm -f $F
 
 rm -f $F