diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 50bd014..155f797 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -48,19 +48,26 @@ jobs: cat ./publish/web/wwwroot/version.txt - name: Setup SSH key - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }} + run: | + mkdir -p ~/.ssh + echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key + chmod 600 ~/.ssh/deploy_key + cat >> ~/.ssh/config << EOF + Host deploy + HostName ${{ secrets.DEPLOY_HOST }} + User ${{ secrets.DEPLOY_USER }} + IdentityFile ~/.ssh/deploy_key + StrictHostKeyChecking no + EOF + chmod 644 ~/.ssh/config - name: Deploy Web run: | WEB_TIMESTAMP=$(date +%Y%m%d_%H%M%S) - mkdir -p ~/.ssh - echo "${{ secrets.DEPLOY_HOST }}" >> ~/.ssh/known_hosts || true tar -czf web_publish.tar.gz -C publish web - scp web_publish.tar.gz ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }}:/tmp/ + scp web_publish.tar.gz deploy:/tmp/ - ssh ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} /bin/bash << 'EOF' + ssh deploy /bin/bash << 'EOF' WEB_TIMESTAMP=$(date +%Y%m%d_%H%M%S) WEB_DEPLOY_DIR="/home/${{ secrets.DEPLOY_USER }}/deployments/taxbaik_${WEB_TIMESTAMP}" mkdir -p "$WEB_DEPLOY_DIR" @@ -95,9 +102,9 @@ jobs: run: | ADMIN_TIMESTAMP=$(date +%Y%m%d_%H%M%S) tar -czf admin_publish.tar.gz -C publish admin - scp admin_publish.tar.gz ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }}:/tmp/ + scp admin_publish.tar.gz deploy:/tmp/ - ssh ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} /bin/bash << 'EOF' + ssh deploy /bin/bash << 'EOF' ADMIN_TIMESTAMP=$(date +%Y%m%d_%H%M%S) ADMIN_DEPLOY_DIR="/home/${{ secrets.DEPLOY_USER }}/deployments/taxbaik_admin_${ADMIN_TIMESTAMP}" mkdir -p "$ADMIN_DEPLOY_DIR"