From 150bf4bee81c5462f14b5fda50e23c48bf3e4fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Fri, 3 May 2019 17:34:49 +0200 Subject: [PATCH] =?UTF-8?q?Pr=C3=A9cisons=20la=20cl=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softwares/secure_tunnel.sls | 1 + templates/secure-tunnel.service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/softwares/secure_tunnel.sls b/softwares/secure_tunnel.sls index c0bf7c3..3b7043d 100644 --- a/softwares/secure_tunnel.sls +++ b/softwares/secure_tunnel.sls @@ -21,6 +21,7 @@ - template: jinja - defaults: ANS_ADDR_TARGET: {{ANS_ADDR_TARGET}} + KEY_NAME: {{KEY_NAME}} 'secure_tunnel_default_file': file.managed: diff --git a/templates/secure-tunnel.service b/templates/secure-tunnel.service index c2a4bc7..7312b09 100644 --- a/templates/secure-tunnel.service +++ b/templates/secure-tunnel.service @@ -6,7 +6,7 @@ After=network.target [Service] User=${ANS_REMOTE_USER} EnvironmentFile=/etc/default/secure-tunnel -ExecStart=/usr/bin/ssh -p ${REMOTE_PORT} -NT -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R ${RTARGET_PORT}:localhost:22 ${ANS_TARGET_USER}@${TARGET} +ExecStart=/usr/bin/ssh -p ${REMOTE_PORT} -NT -i $HOME/.ssh/{{KEY_NAME}} -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R ${RTARGET_PORT}:localhost:22 ${ANS_TARGET_USER}@${TARGET} # Restart every >2 seconds to avoid StartLimitInterval failure RestartSec=5