Adding sshport parameter

diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp
index b4e7bdf829fdc59bc748ae0eac30f92d51bb9381..b10ae5a2caf05b8d26079dc46c224970dc79141c 100644 (file)
--- a/manifests/tunnel.pp
+++ b/manifests/tunnel.pp
@@ -5,6 +5,7 @@ define autossh::tunnel (
   $port,
   $host = 'localhost',
   $hostport,
+  $sshport = '22',
   $remote_host,
   $remote_user = 'absent',
   $monitor_port = 'absent',

diff --git a/templates/autossh-tunnel.erb b/templates/autossh-tunnel.erb
index e89bc2ac8e54be4addd900b03fd85a94b91e0e39..0a552d81b077af1165414e851eab7ae14d26fae4 100644 (file)
--- a/templates/autossh-tunnel.erb
+++ b/templates/autossh-tunnel.erb
@@ -26,7 +26,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 #
 # AutoSSH configuration
 #
-AUTOSSH_ARGS="-M <%= real_monitor_port %> -N -L <%= bind_address %>:<%= port %>:<%= host %>:<%= hostport %> <%= ssh_extra_options %> <%= real_remote_user %>@<%= remote_host %>"
+AUTOSSH_ARGS="-M <%= real_monitor_port %> -N -L <%= bind_address %>:<%= port %>:<%= host %>:<%= hostport %> <%= ssh_extra_options %> -p <%= ssh_port %> <%= real_remote_user %>@<%= remote_host %>"
 <% if gatetime != 'absent' -%>
 AUTOSSH_GATETIME=<%= gatetime %>
 <% end -%>