Use a connection URI for postgres monitoring

[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 04eaeebd7c3c0028959cef731ce6ef9939b686f3..7cf32f39ce7b631dca7474a453c98be9a9a8a094 100644 (file)
--- a/cookbooks/db/templates/default/backup-db.erb
+++ b/cookbooks/db/templates/default/backup-db.erb
@@ -3,11 +3,9 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 D=`date +%Y-%m-%d`
-F=/tmp/osm-${D}.dmp
+F=/store/backup/osm-${D}.dmp
 
-pg_dump --user=backup --format=custom --file=$F openstreetmap
-
-export RSYNC_RSH="ssh -ax -c arcfour"
-rsync $F backup.openstreetmap.org::backup
+pg_dump --user=backup --format=custom --file=$F openstreetmap && \
+  rsync $F backup.openstreetmap.org::backup
 
 rm -f $F