diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml deleted file mode 100644 index 132d9af..0000000 --- a/.forgejo/workflows/deploy.yaml +++ /dev/null @@ -1,52 +0,0 @@ -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 openssh-client rsync - - - name: Check versions - run: | - cat /etc/os-release - git version - hugo version - python --version - - - name: Checkout repository - run: | - git clone -b ${{ forgejo.ref_name }} --recursive 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 - env: - SSH_PRIVATE_KEY: ${{ forgejo.ref_name == 'production' && secrets.SSH_PRIVATE_KEY_PRODUCTION || secrets.SSH_PRIVATE_KEY_STAGING }} - run: | - 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: 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 - if: ${{ always() }} - run: rm -rf ~/.ssh diff --git a/config/_default/languages.de.toml b/config/_default/languages.de.toml index 1301a61..d4df809 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:mail2026@berlin.ccc.de" }, + { email = "mailto:mail2025@berlin.ccc.de" }, { github = "https://github.com/cccb/" }, ] diff --git a/content/post/2025-dg-call-for-action/index.md b/content/post/2025-dg-call-for-action/index.md index a3f4df0..96bea90 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 diff --git a/requirements.txt b/requirements.txt index c61ba7f..134909f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1 @@ icalendar==5.0.7 -pytz \ No newline at end of file