From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 3 Mar 2017 16:12:39 +0000 (+0100)
Subject: Set ServerAliveInterval and BatchMode on ssh to backuphost
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=834f6ca4076c0a94629b206712fc4f90496797b0;p=mirror%2Fdsa-puppet.git

Set ServerAliveInterval and BatchMode on ssh to backuphost
---

diff --git a/modules/roles/files/postgresql_server/pg-backup-file b/modules/roles/files/postgresql_server/pg-backup-file
index 4b6f7d3d8..ff2a49397 100755
--- a/modules/roles/files/postgresql_server/pg-backup-file
+++ b/modules/roles/files/postgresql_server/pg-backup-file
@@ -69,7 +69,7 @@ for target in $backuphost; do
 		[ -n "$checksum" ] || checksum="`sha512sum "$file" | awk '{print $1}'`"
 		info "Archiving to $target: ($myhost,$targetname,$size,$checksum)"
 
-		ssh -C "$target" $ssh_options $myhost store-file pg "$targetname" "$size" "$checksum" < "$file"
+		ssh -C "$target" $ssh_options -o BatchMode=yes -o ServerAliveInterval=90 $myhost store-file pg "$targetname" "$size" "$checksum" < "$file"
 		if [ "$?" != 0 ]; then
 			croak "remote store for $logtuple failed."
 		fi