From 2ffbe8b449b9c116f063b51bfb65aa2bb56fe483 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Mon, 19 Jan 2026 22:47:19 +0100 Subject: [PATCH] fix --- .gitea/workflows/deploy.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 9fdce021..a2d57f5f 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -52,21 +52,24 @@ jobs: - name: Setup SSH run: | mkdir -p ~/.ssh - echo "${{ secrets.ALPHA_SSH_KEY }}" > ~/.ssh/id_deploy - chmod 600 ~/.ssh/id_deploy + printf "%s\n" "${{ secrets.ALPHA_SSH_KEY }}" > ~/.ssh/id_ed25519 + chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H alpha.mintel.me >> ~/.ssh/known_hosts # --- Sync files --- - name: Sync files to server run: | - tar czf - docker-compose.y*ml $([ -d ./varnish ] && echo varnish) | \ - ssh -i ~/.ssh/id_deploy -o StrictHostKeyChecking=no deploy@alpha.mintel.me \ - "mkdir -p /home/deploy/sites/klz-cables.com/ && tar xzf - -C /home/deploy/sites/klz-cables.com/" + # Use IPQoS=0x00 to prevent connection drops and -O for legacy SCP protocol + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me "mkdir -p /home/deploy/sites/klz-cables.com/" + scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 -O ./docker-compose.y*ml deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/ + if [ -d ./varnish ]; then + scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 -O -r ./varnish deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/ + fi # --- Deploy --- - name: Deploy on server run: | - ssh -i ~/.ssh/id_deploy -o StrictHostKeyChecking=no deploy@alpha.mintel.me ' + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me ' cd /home/deploy/sites/klz-cables.com && (docker compose -f docker-compose.yml pull 2>/dev/null || docker compose -f docker-compose.yaml pull) && docker image prune -f &&