diff --git a/.gitea/workflows/deploy-my-vpn.yml b/.gitea/workflows/deploy-my-vpn.yml index 5f4f610..31676fd 100644 --- a/.gitea/workflows/deploy-my-vpn.yml +++ b/.gitea/workflows/deploy-my-vpn.yml @@ -20,7 +20,11 @@ jobs: chmod 700 ~/.ssh printf '%s' "$VPN_SSH_KEY_B64" | base64 -d > ~/.ssh/id_ci_runner chmod 600 ~/.ssh/id_ci_runner + VPN_USER="$(printf '%s' "$VPN_USER" | tr -d '\r\n')" + VPN_HOST="$(printf '%s' "$VPN_HOST" | tr -d '\r\n')" + echo "using user=${VPN_USER} host=${VPN_HOST}" ssh-keyscan -H "$VPN_HOST" >> ~/.ssh/known_hosts || true - ssh -vvv -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/id_ci_runner "$VPN_USER@$VPN_HOST" "echo ok" + ssh-keygen -lf ~/.ssh/id_ci_runner + ssh -vvv -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/id_ci_runner "${VPN_USER}@${VPN_HOST}" "echo ok" - ssh -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/id_ci_runner "$VPN_USER@$VPN_HOST" "cd /srv/ip-ua && git fetch --all && git reset --hard origin/main && bash deploy/my-vpn/deploy.sh" + ssh -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/id_ci_runner "${VPN_USER}@${VPN_HOST}" "cd /srv/ip-ua && git fetch --all && git reset --hard origin/main && bash deploy/my-vpn/deploy.sh"