From 3f34eef31c76eb2a507b9dc90e7280460c617eec Mon Sep 17 00:00:00 2001
From: Didier <didier@faulty.nl>
Date: Sat, 29 Apr 2023 21:31:42 +0200
Subject: [PATCH] pls work

---
 .github/workflows/update-server.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/update-server.yml b/.github/workflows/update-server.yml
index 3954789..a48dad9 100644
--- a/.github/workflows/update-server.yml
+++ b/.github/workflows/update-server.yml
@@ -5,15 +5,28 @@ jobs:
   update:
     runs-on: ubuntu-latest
     steps:
-      - run: apt update -y && apt install -y openssh-client
-      - run: mkdir ~/.ssh
-      - name: create ssh profile
-        run: echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-      - run: chmod 600 ~/.ssh/id_rsa
+      - name: setup ssh
+        run: |
+          mkdir -p ~/.ssh/
+          echo "$SSH_KEY" > ~/.ssh/staging.key
+          chmod 600 ~/.ssh/staging.key
+          cat >>~/.ssh/config <<END
+          Host staging
+            HostName $SSH_HOST
+            Port $SSH_PORT
+            User $SSH_USER
+            IdentityFile ~/.ssh/staging.key
+            StrictHostKeyChecking no
+          END
+        env:
+          SSH_HOST: neo.ixvd.net
+          SSH_PORT: ${{ secrets.SSH_PORT }}
+          SSH_USER: automation
+          SSH_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       - name: update git
-        run: ssh -o StrictHostKeyChecking=no -p ${{ secrets.SSH_PORT }} automation@neo.ixvd.net srvctl -fn neo mm u git
+        run: ssh staging srvctl -fn neo mm u git
       - name: enforce new config
-        run: ssh -o StrictHostKeyChecking=no -p ${{ secrets.SSH_PORT }} automation@neo.ixvd.net srvctl -fn neo mm e
+        run: ssh staging srvctl -fn neo mm e
       - name: send ping to ntfy
         if: always()
         run: "curl -d '${{ job.status }}: ${{ github.repositoryUrl }} @ ${{ github.sha }}' https://push.ixvd.net/${{ secrets.NTFY_TOPIC }}"
\ No newline at end of file