From: Tom Hughes <tom@compton.nu>
Date: Mon, 9 Oct 2017 23:50:25 +0000 (+0100)
Subject: Only sync the database backup if pg_dump succeeds
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/06b8c2609dac3b834dcf33af1f394354771a3fa5?ds=sidebyside

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 492dded40..78ae1c8f7 100644
--- 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
 
-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