From 8d7b62012e05c389113d9e3a69a4125d7a6dbc10 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Thu, 13 Jun 2024 23:23:31 +0200 Subject: [PATCH] User correct deploy user --- .forgejo/workflows/cleanup.yaml | 2 +- .forgejo/workflows/deploy.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml index bf17be8..145e606 100644 --- a/.forgejo/workflows/cleanup.yaml +++ b/.forgejo/workflows/cleanup.yaml @@ -20,4 +20,4 @@ jobs: echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts - name: Staging Deployment - Remove PR from staging run: | - ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" + ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 6dd140e..b946a7b 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: if: github.event_name == 'pull_request' run: | echo "Deploying to staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}" - rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.hacker.tours/pr${{ github.event.pull_request.number }}/ + rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.hacker.tours/pr${{ github.event.pull_request.number }}/ - name: Deploy - Add comment to PR with staging URL if: github.event_name == 'pull_request' && github.event.action == 'opened' run: | @@ -64,7 +64,7 @@ jobs: - name: Deploy - Upload to prod if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main' run: | - rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ ccchh-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/hacker.tours/ + rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/hacker.tours/ - uses: actions/upload-artifact@v3 if: github.event_name == 'pull_request'