From c18cce53f8f621670e4bbf0af5ed198122972acd Mon Sep 17 00:00:00 2001 From: aprl Date: Tue, 11 Aug 2026 22:05:13 +0200 Subject: [PATCH 01/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index adae1c6..1da9991 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: - name: Rsync rendered site # TODO: add --delete - run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:$DEPLOY_DIR + run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:/srv/http/www - name: Cleanup if: ${{ always() }} From d3fd2ec8a782bd98cecea61c5061580fbba2e33d Mon Sep 17 00:00:00 2001 From: aprl Date: Tue, 11 Aug 2026 22:05:43 +0200 Subject: [PATCH 02/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 1da9991..adae1c6 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: - name: Rsync rendered site # TODO: add --delete - run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:/srv/http/www + run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:$DEPLOY_DIR - name: Cleanup if: ${{ always() }} From c2a2f6e160ee66cb0c0df7b82150b478e4f6ccb5 Mon Sep 17 00:00:00 2001 From: aprl Date: Tue, 11 Aug 2026 22:07:01 +0200 Subject: [PATCH 03/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index adae1c6..1da9991 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: - name: Rsync rendered site # TODO: add --delete - run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:$DEPLOY_DIR + run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:/srv/http/www - name: Cleanup if: ${{ always() }} From dfae28d575654c5452bc3618a5673aeec757f6e7 Mon Sep 17 00:00:00 2001 From: aprl Date: Tue, 11 Aug 2026 22:10:47 +0200 Subject: [PATCH 04/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 1da9991..adae1c6 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: - name: Rsync rendered site # TODO: add --delete - run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:/srv/http/www + run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:$DEPLOY_DIR - name: Cleanup if: ${{ always() }} From 96919a71888bf9a6d7d94f6e44c123be7934af0a Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Tue, 11 Aug 2026 22:20:30 +0200 Subject: [PATCH 05/11] fix pipeline --- .forgejo/workflows/deploy.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index adae1c6..d86974b 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -1,4 +1,5 @@ name: deploy blog + on: workflow_dispatch: schedule: @@ -11,7 +12,7 @@ on: jobs: deploy: runs-on: ubuntu-latest - steps: + steps: - name: Install dependencies run: apk --no-cache add hugo python3 py3-pip git openssh-client rsync @@ -23,11 +24,8 @@ jobs: python --version - name: Set envionment vars - run: | - echo "GIT_BRANCH=${{ forgejo.event_name == 'schedule' && 'production' || forgejo.ref_name }}" >> "$FORGEJO_ENV" - echo "SSH_PRIVATE_KEY=${{ env.GIT_BRANCH == 'production' && secrets.SSH_PRIVATE_KEY_PRODUCTION || secrets.SSH_PRIVATE_KEY_STAGING }}" >> "$FORGEJO_ENV" - echo "DEPLOY_DIR=${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }}" >> "$FORGEJO_ENV" - + run: echo "GIT_BRANCH=${{ forgejo.event_name == 'schedule' && 'production' || forgejo.ref_name }}" >> "$FORGEJO_ENV" + - name: Checkout repository run: | git clone -b $GIT_BRANCH --recursive https://git.berlin.ccc.de/cccb-website-team/www.git . @@ -43,15 +41,15 @@ jobs: run: | mkdir -p ~/.ssh printf "%s" "${{ secrets.KNOWN_HOSTS }}" | base64 -d > ~/.ssh/known_hosts - printf "%s" "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/id_ed25519 + printf "%s" "${{ env.GIT_BRANCH == 'production' && secrets.SSH_PRIVATE_KEY_PRODUCTION || secrets.SSH_PRIVATE_KEY_STAGING }}" | base64 -d > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 ssh-keygen -f ~/.ssh/id_ed25519 -y > ~/.ssh/id_ed25519.pub cat ~/.ssh/id_ed25519.pub - name: Rsync rendered site - # TODO: add --delete - run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:$DEPLOY_DIR + run: rsync -var --delete -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} - name: Cleanup if: ${{ always() }} run: rm -rf ~/.ssh + From 2ba5b8cfa8a9318239737c775095a77628a840ef Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Tue, 11 Aug 2026 22:29:30 +0200 Subject: [PATCH 06/11] fix pipeline --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index d86974b..c745480 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -47,7 +47,7 @@ jobs: cat ~/.ssh/id_ed25519.pub - name: Rsync rendered site - run: rsync -var --delete -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} + run: rsync -var --delete-after -e 'ssh -vvv -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} - name: Cleanup if: ${{ always() }} From f839b1b01a9ce465fb607861f2331633ccf6184c Mon Sep 17 00:00:00 2001 From: xengi Date: Tue, 11 Aug 2026 22:37:45 +0200 Subject: [PATCH 07/11] Update .forgejo/workflows/deploy.yaml Signed-off-by: xengi --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index c745480..eb7676a 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -47,7 +47,7 @@ jobs: cat ~/.ssh/id_ed25519.pub - name: Rsync rendered site - run: rsync -var --delete-after -e 'ssh -vvv -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} + run: rsync -var --delete-after -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} - name: Cleanup if: ${{ always() }} From 87e123030158772c2377a0d27f536e0399ca1320 Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Tue, 11 Aug 2026 22:45:17 +0200 Subject: [PATCH 08/11] unfix pipeline --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index eb7676a..c745480 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -47,7 +47,7 @@ jobs: cat ~/.ssh/id_ed25519.pub - name: Rsync rendered site - run: rsync -var --delete-after -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} + run: rsync -var --delete-after -e 'ssh -vvv -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} - name: Cleanup if: ${{ always() }} From bac896e60fa8161177c6a2c99d6d476849c9b0a7 Mon Sep 17 00:00:00 2001 From: xengi Date: Tue, 11 Aug 2026 22:57:01 +0200 Subject: [PATCH 09/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index c745480..1c54057 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -47,7 +47,7 @@ jobs: cat ~/.ssh/id_ed25519.pub - name: Rsync rendered site - run: rsync -var --delete-after -e 'ssh -vvv -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} + run: rsync -var --delete -e 'ssh -vvv -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} - name: Cleanup if: ${{ always() }} From bafe2bcb816acabbdbdd3e47d54cc8578d73e1e0 Mon Sep 17 00:00:00 2001 From: xengi Date: Tue, 11 Aug 2026 23:05:26 +0200 Subject: [PATCH 10/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 1c54057..73cd71b 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -22,6 +22,8 @@ jobs: git version hugo version python --version + rsync --version + ssh -V - name: Set envionment vars run: echo "GIT_BRANCH=${{ forgejo.event_name == 'schedule' && 'production' || forgejo.ref_name }}" >> "$FORGEJO_ENV" From 7689abaf3e63b2a6977f9f69d565a533c650ff5b Mon Sep 17 00:00:00 2001 From: xengi Date: Tue, 11 Aug 2026 23:13:51 +0200 Subject: [PATCH 11/11] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 73cd71b..dfd80bd 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -49,7 +49,7 @@ jobs: cat ~/.ssh/id_ed25519.pub - name: Rsync rendered site - run: rsync -var --delete -e 'ssh -vvv -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} + run: rsync -var --delete -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:${{ env.GIT_BRANCH == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} - name: Cleanup if: ${{ always() }}