From ac2a9a083eefbab7fa63738c9b9e2565844b413e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20Poljan=C5=A1ek?= Date: Wed, 23 Apr 2025 20:59:50 +0200 Subject: [PATCH] Popravek CI/CD workflow za SSH povezavo --- .gitea/workflows/build-deploy.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml index 6d9f39ab..0badde93 100644 --- a/.gitea/workflows/build-deploy.yml +++ b/.gitea/workflows/build-deploy.yml @@ -37,14 +37,24 @@ jobs: cp server.cjs deploy/ cp package.json deploy/ - # Setup SSH for deployment + # Setup SSH for deployment with more verbose output mkdir -p ~/.ssh - echo "$DEPLOY_SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan -t rsa 130.61.236.31 >> ~/.ssh/known_hosts + echo "$DEPLOY_SSH_KEY" > ~/.ssh/deployer_key + chmod 600 ~/.ssh/deployer_key + echo "SSH key saved with proper permissions" - # Deploy to server - rsync -avz --delete deploy/ deployer@130.61.236.31:~/app.spletnimojster.si/ + # Add server to known hosts + ssh-keyscan -t rsa 130.61.236.31 >> ~/.ssh/known_hosts + echo "Server added to known hosts" + + # Test connection first + echo "Testing SSH connection..." + ssh -i ~/.ssh/deployer_key -o StrictHostKeyChecking=no -v deployer@130.61.236.31 'echo "SSH connection successful"' + + # Deploy to server if connection successful + echo "Deploying files to server..." + rsync -avz -e "ssh -i ~/.ssh/deployer_key -o StrictHostKeyChecking=no" --delete deploy/ deployer@130.61.236.31:~/app.spletnimojster.si/ # Install dependencies and restart service on the server - ssh deployer@130.61.236.31 'cd ~/app.spletnimojster.si && npm install --omit=dev && pm2 restart rezervacije || pm2 start server.cjs --name "rezervacije" -- --port 3169' \ No newline at end of file + echo "Installing dependencies and restarting service..." + ssh -i ~/.ssh/deployer_key -o StrictHostKeyChecking=no deployer@130.61.236.31 'cd ~/app.spletnimojster.si && npm install --omit=dev && pm2 restart rezervacije || pm2 start server.cjs --name "rezervacije" -- --port 3169' \ No newline at end of file