redid deploy.yml for change in key type

.gitea/workflows/deploy.yml

@@ -2,45 +2,45 @@ name: Deploy static site
 
 on:
   push:
-    branches:
+    branches: [main]
-      - main
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repo
+      - name: Checkout
         uses: actions/checkout@v4
 
       - name: Install rsync
-        run: |
+        run: sudo apt-get update && sudo apt-get install -y rsync
-          sudo apt-get update
-          sudo apt-get install -y rsync
 
       - name: Setup SSH
         run: |
-            mkdir -p ~/.ssh
+          mkdir -p ~/.ssh
-            echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_rsa
+          echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519
-            chmod 600 ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_ed25519
-            
+
-            ssh-keyscan -p ${{ secrets.DEPLOY_PORT }} -t rsa ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan -p ${{ secrets.DEPLOY_PORT }} ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
-            
+
-            cat <<EOF >> ~/.ssh/config
+      - name: Test SSH connection
-            Host deploy
+        run: |
-              HostName ${{ secrets.DEPLOY_HOST }}
+          ssh -i ~/.ssh/id_ed25519 \
-              User ${{ secrets.DEPLOY_USER }}
+              -p ${{ secrets.DEPLOY_PORT }} \
-              Port ${{ secrets.DEPLOY_PORT }}
+              -o StrictHostKeyChecking=yes \
-              IdentityFile ~/.ssh/id_rsa
+              ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} \
-              IdentitiesOnly yes
+              "echo SSH connection successful"
-              StrictHostKeyChecking yes
+
-              HostKeyAlgorithms ssh-rsa
+      - name: Ensure remote directory exists
-              PubkeyAcceptedAlgorithms +ssh-rsa
+        run: |
-            EOF
+          ssh -i ~/.ssh/id_ed25519 \
+              -p ${{ secrets.DEPLOY_PORT }} \
+              ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} \
+              "mkdir -p ${{ secrets.DEPLOY_PATH }}"
 
       - name: Deploy via rsync
         run: |
           rsync -avz --delete \
-              -e "ssh deploy" \
+            -e "ssh -i ~/.ssh/id_ed25519 -p ${{ secrets.DEPLOY_PORT }}" \
-              index.html styles.css de/ en/ \
+            index.html styles.css de/ en/ \
-              deploy:${{ secrets.DEPLOY_PATH }}
+            ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }}:${{ secrets.DEPLOY_PATH }}