fix: set up ssh private key correctly

1 files changed, 18 insertions, 4 deletions

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 9fc34fb..e3bacd2 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -47,22 +47,36 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up SSH private key
+
+      - name: Set up SSH connection for pl.saya.today
+        run: |
+          mkdir -p ~/.ssh
+          (cat <<EOF
+          ${{ secrets.SVC_GITHUB_PK }}
+          EOF
+          ) > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          sed -i 's/\r$//' ~/.ssh/id_ed25519
+          ssh-keyscan -H pl.saya.today >> ~/.ssh/known_hosts
+
+      - name: Test SSH connection
         run: |
-          echo "${{ secrets.SVC_GITHUB_PK }}" > deploy/private_key.pem
-          chmod 600 deploy/private_key.pem
+          ssh -o ConnectTimeout=10 -i ~/.ssh/id_rsa svc_github@pl.saya.today "echo 'SSH connection successful'"
+
       - name: Install Ansible
         shell: bash
         run: |
           sudo apt update
           sudo apt install -y ansible
+
       - name: Run Ansible playbook
         env:
           ANSIBLE_HOST_KEY_CHECKING: False
         working-directory: ./deploy
         run: >
           ansible-playbook -i inventory.yml -l stage playbook.yml
-            --private-key private_key.pem
+            --private-key ~/.ssh/id_ed25519
+            -u svc_github
             -e saya_today_web.b2.key_id=${{ secrets.B2_KEY_ID }}
             -e saya_today_web.b2.application_key=${{ secrets.B2_APPLICATION_KEY }}
             -e saya_today_web.tag=${{ github.ref_name }}