From 8d9bded5e977016d13e6521ee383cb3d5918506f Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Sat, 26 Dec 2009 14:15:51 -0500 Subject: if 'monitor_port' is defined, don't enable ServerAliveInterval and ServerAliveCountMax --- templates/autossh-tunnel.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/autossh-tunnel.erb b/templates/autossh-tunnel.erb index 3302f5a..f19cb51 100644 --- a/templates/autossh-tunnel.erb +++ b/templates/autossh-tunnel.erb @@ -26,7 +26,7 @@ SCRIPTNAME=/etc/init.d/$NAME # # AutoSSH configuration # -AUTOSSH_ARGS="-M <%= monitor_port %> -N -o ServerAliveInterval=30 -o ServerAliveCountMax=3 -L <%= bind_address %>:<%= port %>:<%= host %>:<%= hostport %> <%= remote_host %>" +AUTOSSH_ARGS="-M <%= real_monitor_port %> -N -L <%= bind_address %>:<%= port %>:<%= host %>:<%= hostport %> <%= ssh_extra_options %> <%= remote_host %>" <% if gatetime != 'absent' -%> AUTOSSH_GATETIME=<%= gatetime %> <% end -%> -- cgit v1.2.3