From 7de4926427a99981da11c4b5a15123de986f2d93 Mon Sep 17 00:00:00 2001
From: shockrah <dev@shockrah.xyz>
Date: Tue, 3 Sep 2024 18:32:22 -0700
Subject: [PATCH] use plain scp

---
 .gitea/workflows/build-and-deploy.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml
index 249032f..86182c8 100644
--- a/.gitea/workflows/build-and-deploy.yml
+++ b/.gitea/workflows/build-and-deploy.yml
@@ -6,6 +6,9 @@ on:
 
 jobs:
   setup-website-content:
+    env:
+      remote_path: "/opt/nginx/test.shockrah.xyz"
+      ssh_target: "${{ secrets.USER }}@${{ secrets.HOST }}"
     runs-on: ubuntu-latest
     container:
       image: shockrah/hugo
@@ -14,14 +17,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Build website content
         run: hugo
-      - name: Check file content is present
-        run: pwd && ls -lRt public/
-      - name: SCP Files in public up to the remote ( prolly us ) server
-        uses: appleboy/scp-action@master
-        with:
-          HOST: ${{ secrets.HOST }}
-          USERNAME:  ${{ secrets.USER }}
-          PORT:  ${{ secrets.PORT }}
-          KEY:  ${{ secrets.PRIVATE_KEY }}
-          source: "public"
-          target: "/opt/nginx/test.shockrah.xyz"
+      - name: Setup ssh agent
+        run: eval($(ssh-agent -s)
+      - name: Add private key to agent
+        run: echo ${{ secrets.PRIVATE_KEY }} | ssh-add - > /dev/null
+      - name: Create tmp .ssh directory
+        run: mkdir -p ~/.ssh
+      - name: Ensure perms on tmp .ssh directory
+        run: chmod 0700 ~/.ssh
+      - name: SCP Files to resume web server
+        run: "scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path"