From 550013a8fff74d4e91baca04fb4db0721faf8db0 Mon Sep 17 00:00:00 2001 From: xengi Date: Fri, 13 Feb 2026 20:52:12 +0100 Subject: [PATCH 1/5] Add .forgejo/workflows/deploy.yaml Signed-off-by: xengi --- .forgejo/workflows/deploy.yaml | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .forgejo/workflows/deploy.yaml diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..506894f --- /dev/null +++ b/.forgejo/workflows/deploy.yaml @@ -0,0 +1,62 @@ +name: deploy blog +on: + workflow_dispatch: + push: + branches: + - staging + - production + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Install dependencies + run: apk --no-cache add hugo python3 py3-pip git + + - name: Check install + run: | + cat /etc/os-release + git version + hugo version + python --version + + - name: Checkout repo + run: | + git clone -b ${{ forgejo.ref_name }} https://git.berlin.ccc.de/cccb-website-team/www.git . + git status + + - name: Install Python depenndencies + run: python -m pip install -r requirements.txt --break-system-packages + + - name: Render site + run: ./build.sh + + - name: Setup SSH key + if: forgejo.ref_name == 'staging' + run: | + mkdir -p .ssh + echo ${{ secrets.SSH_PRIVATE_KEY_STAGING }} > .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: Setup SSH key + if: forgejo.ref_name == 'production' + run: | + mkdir -p .ssh + echo ${{ secrets.SSH_PRIVATE_KEY_PRODUCTION }} > .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: Sync rendered site to staging + if: forgejo.ref_name == 'staging' + run: rsync -var -e 'ssh -i .ssh/id_ed25519' ./public/ deploy@www.berlin.ccc.de:srv/http/www-staging/ + continue-on-error: true + - name: Sync rendered site to production + if: forgejo.ref_name == 'production' + run: rsync -var -e 'ssh -i .ssh/id_ed25519' ./public/ deploy@www.berlin.ccc.de:srv/http/www/ + continue-on-error: true + + - name: Cleanup + run: rm -rf .ssh -- 2.51.2 From 73b27d6bae8e68602ab2b234635224ec9a2c775a Mon Sep 17 00:00:00 2001 From: xengi Date: Sun, 15 Feb 2026 16:34:16 +0100 Subject: [PATCH 2/5] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 134909f..c61ba7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ icalendar==5.0.7 +pytz \ No newline at end of file -- 2.51.2 From e6de2cd933d9b582b2055045cb6d125c80165b6d Mon Sep 17 00:00:00 2001 From: xengi Date: Sun, 15 Feb 2026 16:38:44 +0100 Subject: [PATCH 3/5] Update content/post/2025-dg-call-for-action/index.md --- content/post/2025-dg-call-for-action/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/post/2025-dg-call-for-action/index.md b/content/post/2025-dg-call-for-action/index.md index 96bea90..a3f4df0 100644 --- a/content/post/2025-dg-call-for-action/index.md +++ b/content/post/2025-dg-call-for-action/index.md @@ -22,7 +22,7 @@ _Talks in German and English are welcome!_ **Kontakt / Contact:** - + {{< icon "mastodon" >}} **Mastodon-DM:** https://chaos.social/@clubdiscordia -- 2.51.2 From 96a100c59db2fc64e94891b0f4d1ced7282b9f01 Mon Sep 17 00:00:00 2001 From: xengi Date: Sun, 15 Feb 2026 16:44:38 +0100 Subject: [PATCH 4/5] Update .forgejo/workflows/deploy.yaml --- .forgejo/workflows/deploy.yaml | 48 ++++++++++++++-------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 506894f..132d9af 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -11,18 +11,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Install dependencies - run: apk --no-cache add hugo python3 py3-pip git + run: apk --no-cache add hugo python3 py3-pip git openssh-client rsync - - name: Check install + - name: Check versions run: | cat /etc/os-release git version hugo version python --version - - name: Checkout repo + - name: Checkout repository run: | - git clone -b ${{ forgejo.ref_name }} https://git.berlin.ccc.de/cccb-website-team/www.git . + git clone -b ${{ forgejo.ref_name }} --recursive https://git.berlin.ccc.de/cccb-website-team/www.git . git status - name: Install Python depenndencies @@ -31,32 +31,22 @@ jobs: - name: Render site run: ./build.sh - - name: Setup SSH key - if: forgejo.ref_name == 'staging' + - name: Setup SSH + env: + SSH_PRIVATE_KEY: ${{ forgejo.ref_name == 'production' && secrets.SSH_PRIVATE_KEY_PRODUCTION || secrets.SSH_PRIVATE_KEY_STAGING }} run: | - mkdir -p .ssh - echo ${{ secrets.SSH_PRIVATE_KEY_STAGING }} > .ssh/id_ed25519 - chmod 600 .ssh/id_ed25519 - ssh-keygen -f .ssh/id_ed25519 -y > .ssh/id_ed25519.pub - cat .ssh/id_ed25519.pub + mkdir -p ~/.ssh + printf "%s" "${{ secrets.KNOWN_HOSTS }}" | base64 -d > ~/.ssh/known_hosts + printf "%s" "$SSH_PRIVATE_KEY" | 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: Setup SSH key - if: forgejo.ref_name == 'production' - run: | - mkdir -p .ssh - echo ${{ secrets.SSH_PRIVATE_KEY_PRODUCTION }} > .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: Sync rendered site to staging - if: forgejo.ref_name == 'staging' - run: rsync -var -e 'ssh -i .ssh/id_ed25519' ./public/ deploy@www.berlin.ccc.de:srv/http/www-staging/ - continue-on-error: true - - name: Sync rendered site to production - if: forgejo.ref_name == 'production' - run: rsync -var -e 'ssh -i .ssh/id_ed25519' ./public/ deploy@www.berlin.ccc.de:srv/http/www/ - continue-on-error: true + - name: Rsync rendered site + env: + DEPLOY_DIR: ${{ forgejo.ref_name == 'production' && '/srv/http/www/' || '/srv/http/www-staging/' }} + run: rsync -var -e 'ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes' ./public/ deploy@www.berlin.ccc.de:$DEPLOY_DIR - name: Cleanup - run: rm -rf .ssh + if: ${{ always() }} + run: rm -rf ~/.ssh -- 2.51.2 From 6dc7220c85a760f461d0e29bd463c88b3731085b Mon Sep 17 00:00:00 2001 From: fluepke Date: Sun, 15 Feb 2026 21:31:24 +0100 Subject: [PATCH 5/5] Update config/_default/languages.de.toml --- config/_default/languages.de.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/_default/languages.de.toml b/config/_default/languages.de.toml index d4df809..1301a61 100644 --- a/config/_default/languages.de.toml +++ b/config/_default/languages.de.toml @@ -27,6 +27,6 @@ headline = "Willkommen! Wir sind ein Erfa-Kreis des Chaos Computer Club e.V. und links = [ { mastodon = "https://chaos.social/@clubdiscordia" }, { forgejo = "https://git.berlin.ccc.de/explore/repos" }, - { email = "mailto:mail2025@berlin.ccc.de" }, + { email = "mailto:mail2026@berlin.ccc.de" }, { github = "https://github.com/cccb/" }, ] -- 2.51.2