Merge pull request 'fu github pipelines' (#51) from staging into production

Reviewed-on: #51

.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
 
@@ -21,13 +22,12 @@ 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"
-          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 +43,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
+