diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml index 22ac2d9..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' hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.hacker.tours/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 a6f0624..38170cb 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: - name: Deploy - Upload PR to staging if: github.event_name == 'pull_request' run: | - echo "Deploying to staging.hacker.tours/pr${{ github.event.pull_request.number }}" + 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/ 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' @@ -60,7 +60,7 @@ jobs: ${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \ -H "Content-Type: application/json" \ -H "Authorization: token $GITHUB_TOKEN" \ - --data '{ "body": "You can view your changes at https://staging.hacker.tours/pr${{ github.event.pull_request.number }}/" }' + --data '{ "body": "You can view your changes at https://staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" }' - name: Deploy - Upload to prod if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main' diff --git a/content/de/_index.md b/content/de/_index.md index e13f943..2e1354f 100644 --- a/content/de/_index.md +++ b/content/de/_index.md @@ -14,7 +14,8 @@ events: event: 40. Chaos Communication Congress date: 27.–30. Dezember 2026 location: Hamburg Messe - url: https://hackertours.hamburg.ccc.de/de/40c3/ + url: https://events.ccc.de/congress/2026/ + status: In Vorbereitung - code: EH23 title: The Bunny is a Lie event: Easterhegg 2026 diff --git a/content/en/_index.md b/content/en/_index.md index e036f20..2e5811f 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -14,7 +14,8 @@ events: event: 40th Chaos Communication Congress date: 27–30 December 2026 location: Hamburg Messe - url: https://hackertours.hamburg.ccc.de/de/40c3/ + url: https://events.ccc.de/congress/2026/ + status: In preparation - code: EH23 title: The Bunny is a Lie event: Easterhegg 2026