aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-05-29 14:15:30 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-05-29 14:15:30 -0300
commit65b22cccccc2bf55014f84ddde1c67b6c08b065d (patch)
tree05b901a00782cd9a671dfcf0767152730c8c3715
parentfcad3473dd09ae8a42b5095001d721da1dd24f1a (diff)
downloadpuppet-autossh-65b22cccccc2bf55014f84ddde1c67b6c08b065d.tar.gz
puppet-autossh-65b22cccccc2bf55014f84ddde1c67b6c08b065d.tar.bz2
Adding sshport parameter
-rw-r--r--manifests/tunnel.pp1
-rw-r--r--templates/autossh-tunnel.erb2
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp
index b4e7bdf..b10ae5a 100644
--- 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 e89bc2a..0a552d8 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 <%= 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 -%>