From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 19 Dec 2012 21:50:50 +0000 (+0100)
Subject: try these options
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=df5380d1fe6b1c9fe118051545eef28bb1b4b414;p=mirror%2Fdsa-puppet.git

try these options
---

diff --git a/modules/roles/templates/static-mirroring/static-update-component.erb b/modules/roles/templates/static-mirroring/static-update-component.erb
index 97636d94f..53887add2 100755
--- a/modules/roles/templates/static-mirroring/static-update-component.erb
+++ b/modules/roles/templates/static-mirroring/static-update-component.erb
@@ -68,7 +68,7 @@ lines.join("\n")
 %>
 
   for master_idx in ${!masters[*]}; do
-    ssh -t -o BatchMode=yes "${masters[$master_idx]}" static-master-update-component "$component"
+    ssh -t -o ServerAliveInterval=300 -o PreferredAuthentications=publickey "${masters[$master_idx]}" static-master-update-component "$component" < /dev/null
   done
 fi