Use TCP/IP connections for FPM on 14.04

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

diff --git a/cookbooks/nominatim/templates/default/backup-nominatim.erb b/cookbooks/nominatim/templates/default/backup-nominatim.erb
index 03dc01f46a59450179f87688ca55035a48ca3ec2..418195074d9f40b7405d6d44f033c25b403a2ab4 100644 (file)
--- a/cookbooks/nominatim/templates/default/backup-nominatim.erb
+++ b/cookbooks/nominatim/templates/default/backup-nominatim.erb
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -e
 
 # DO NOT EDIT - This file is being maintained by Chef
 
@@ -12,8 +12,9 @@
 D=`date +%Y-%m-%d`
 F=/tmp/nominatim-${D}.dmp
 
-pg_dump --file=$F -F c -Z 9 -t 'country' -t file -t '*columns' -t 'import_polygon_*' -t import_status -t place_addressline -t placex -t search_name -t 'seq_*' -t word -t gb_postcode <%= node[:nominatim][:database][:dbname] %>
+pg_dump --file=$F -F c -Z 9 -t 'country' -t file -t '*columns' -t 'import_polygon_*' -t import_status -t place_addressline -t placex -t search_name -t 'seq_*' -t word <%= node[:nominatim][:database][:dbname] %>
 
+export RSYNC_RSH="ssh -ax -c arcfour"
 rsync $F backup.openstreetmap.org::backup
 
 rm -f $F