From c0896dffda7fb00b037bc224ffccfd2f8777f69d Mon Sep 17 00:00:00 2001 From: Iwan Clement Date: Wed, 8 May 2019 08:32:47 +0200 Subject: [PATCH 1/3] Ubuntu --- Scripts/bootstrap-ansible.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Scripts/bootstrap-ansible.sh b/Scripts/bootstrap-ansible.sh index b39e299..1ee4b77 100755 --- a/Scripts/bootstrap-ansible.sh +++ b/Scripts/bootstrap-ansible.sh @@ -38,9 +38,13 @@ mkdir /home/$USERNAME/.ssh \ && chown -R $USERNAME:$USERNAME /home/$USERNAME \ || exit 3 -if [ -d /var/lib/AccountsService/users ]; then - echo "[User]">/var/lib/AccountsService/users/$USERNAME - echo "SystemAccount=true">>/var/lib/AccountsService/users/$USERNAME +if [ -e $DEBFLAG ]; then + if [ "$(cat $DEBFLAG)" == "buster/sid" ]; then + if [ -d /var/lib/AccountsService/users ]; then + echo "[User]">/var/lib/AccountsService/users/$USERNAME + echo "SystemAccount=true">>/var/lib/AccountsService/users/$USERNAME + fi + fi fi if [ -e $DEBFLAG ]; then From 9cacd5a03939201a6889824620e7b56c3257700a Mon Sep 17 00:00:00 2001 From: Iwan Clement Date: Wed, 8 May 2019 11:47:16 +0200 Subject: [PATCH 2/3] Make it simple --- Scripts/bootstrap-ansible.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Scripts/bootstrap-ansible.sh b/Scripts/bootstrap-ansible.sh index 1ee4b77..ed727f5 100755 --- a/Scripts/bootstrap-ansible.sh +++ b/Scripts/bootstrap-ansible.sh @@ -39,11 +39,9 @@ mkdir /home/$USERNAME/.ssh \ || exit 3 if [ -e $DEBFLAG ]; then - if [ "$(cat $DEBFLAG)" == "buster/sid" ]; then - if [ -d /var/lib/AccountsService/users ]; then - echo "[User]">/var/lib/AccountsService/users/$USERNAME - echo "SystemAccount=true">>/var/lib/AccountsService/users/$USERNAME - fi + if [ -d /var/lib/AccountsService/users ]; then + echo "[User]">/var/lib/AccountsService/users/$USERNAME + echo "SystemAccount=true">>/var/lib/AccountsService/users/$USERNAME fi fi From 5d2315efb902721b253bf4a483fcb4db4dcf1e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Wed, 8 May 2019 17:45:09 +0200 Subject: [PATCH 3/3] no prestart --- templates/secure-tunnel.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/secure-tunnel.service b/templates/secure-tunnel.service index 030ef92..47c0f83 100644 --- a/templates/secure-tunnel.service +++ b/templates/secure-tunnel.service @@ -5,7 +5,7 @@ After=network.target [Service] User={{ANS_REMOTE_USER}} -ExecStartPre=cd /home/{{ANS_REMOTE_USER}} +#ExecStartPre=cd /home/{{ANS_REMOTE_USER}} EnvironmentFile=/etc/default/secure-tunnel ExecStart=/usr/bin/ssh -p ${REMOTE_PORT} -NT -i /home/{{ANS_REMOTE_USER}}/.ssh/{{KEY_NAME}} -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R ${RTARGET_PORT}:localhost:22 ${ANS_TARGET_USER}@${TARGET}