diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-26 14:15:51 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-26 14:15:51 -0500 |
| commit | 8d9bded5e977016d13e6521ee383cb3d5918506f (patch) | |
| tree | 66d01106ccab716edfcfa9ff911f9e002836ecdd /templates | |
| parent | 0321a3210ef6bb42ef8b536d0964bef081294d1d (diff) | |
| download | puppet-autossh-8d9bded5e977016d13e6521ee383cb3d5918506f.tar.gz puppet-autossh-8d9bded5e977016d13e6521ee383cb3d5918506f.tar.bz2 | |
if 'monitor_port' is defined, don't enable ServerAliveInterval and ServerAliveCountMax
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/autossh-tunnel.erb | 2 |
1 files changed, 1 insertions, 1 deletions
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 -%> |