From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 30 Jan 2011 10:01:27 +0000 (+0100)
Subject: Set BatchMode to yes for portforwarder's ssh.  This also implies ServerAliveInterval... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5116a1e0d4b7b1e0290539a182cfdea653be01d7;p=mirror%2Fdsa-puppet.git

Set BatchMode to yes for portforwarder's ssh.  This also implies ServerAliveInterval set to 300
---

diff --git a/modules/portforwarder/templates/xinetd.erb b/modules/portforwarder/templates/xinetd.erb
index 2d8b99441..c2209355f 100644
--- a/modules/portforwarder/templates/xinetd.erb
+++ b/modules/portforwarder/templates/xinetd.erb
@@ -19,7 +19,7 @@ template = 'service @@TARGET_HOST@@@@TARGET_PORT@@
         group           = portforwarder
         instances       = 10
         server          = /usr/bin/ssh
-        server_args     = -o PreferredAuthentications=publickey -o EscapeChar=none -C @@TARGET_HOST@@ forward-to @@TARGET_PORT@@
+        server_args     = -o PreferredAuthentications=publickey -o EscapeChar=none -o BatchMode=yes -C @@TARGET_HOST@@ forward-to @@TARGET_PORT@@
         cps             = 0 0
 }
 '