Revert "workaround temporary statuscake IP list failure"

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

diff --git a/cookbooks/db/templates/default/backup-db.erb b/cookbooks/db/templates/default/backup-db.erb
index 492dded40be76318cc17b0612f4275237965834b..573f31a5edd7a60d7f993c04ae2be7dcc9eca525 100644 (file)
--- a/cookbooks/db/templates/default/backup-db.erb
+++ b/cookbooks/db/templates/default/backup-db.erb
@@ -1,13 +1,11 @@
-#!/bin/sh
+#!/bin/sh -e

 
 # DO NOT EDIT - This file is being maintained by Chef
 
 D=`date +%Y-%m-%d`
 F=/store/backup/osm-${D}.dmp
 
 
 # DO NOT EDIT - This file is being maintained by Chef
 
 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 $F backup.openstreetmap.org::backup

 
 rm -f $F
 
 rm -f $F