From 34b21fa7aece5ee93b9ec1d31726a0c28013ab44 Mon Sep 17 00:00:00 2001
From: Kim <baumgartner@innov.energy>
Date: Mon, 6 Nov 2023 16:05:04 +0100
Subject: [PATCH] Completed prod deploy also

---
 .gitea/workflows/prod-deploy.yaml  | 54 ++++++++++++++++--------------
 .gitea/workflows/stage-deploy.yaml | 37 ++------------------
 2 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/.gitea/workflows/prod-deploy.yaml b/.gitea/workflows/prod-deploy.yaml
index fb59bb9a5..b0ed6a343 100644
--- a/.gitea/workflows/prod-deploy.yaml
+++ b/.gitea/workflows/prod-deploy.yaml
@@ -8,8 +8,6 @@ jobs:
   Build-and-deploy-Production:
     runs-on: ubuntu-latest
     steps:
-      - run: echo " The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo " The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
       - name: Check out repository code
         uses: actions/checkout@v3
       - run: echo " The ${{ gitea.repository }} repository has been cloned to the runner."
@@ -21,27 +19,31 @@ jobs:
       - run: |
           npm --prefix ${{ gitea.workspace }}/typescript/frontend-marios2 install
           npm --prefix ${{ gitea.workspace }}/typescript/frontend-marios2 run build
-      - name: Configure SSH
-        run: |
-          mkdir -p ~/.ssh/
-          echo "$SSH_KEY" > ~/.ssh/production.key
-          chmod 600 ~/.ssh/production.key
-          cat >>~/.ssh/config <<END
-          Host production
-            HostName $SSH_HOST
-            User $SSH_USER
-            IdentityFile ~/.ssh/production.key
-            StrictHostKeyChecking no
-          END
-        env:
-          SSH_USER: ubuntu
-          SSH_KEY: ${{ secrets.PRODUCTION_SSH_KEY }}
-          SSH_HOST: ${{ secrets.PRODUCTION_SSH_HOST }}
-      - run: |
-          cd ${{ gitea.workspace }}
-          scp -r ./csharp/App/Backend/bin/Release/net6.0/linux-x64/publish/ production:~/backend
-          scp -r ./typescript/frontend-marios2/*  production:~/frontend/
-          ssh production 'sudo systemctl restart backend'
-          ssh production 'sudo cp -rf ~/frontend/build/* /var/www/html/monitor.innov.energy/html/'
-          ssh production 'sudo npm install -g serve'
-      - run: echo " This job's status is ${{ job.status }}."
\ No newline at end of file
+      - name: Copy Backend
+        uses: appleboy/scp-action@v0.1.4
+        with:
+          host: 194.182.190.208
+          username: ubuntu
+          key: ${{ secrets.PRODUCTION_SSH_KEY }}
+          source: "${{ gitea.workspace }}/csharp/App/Backend/bin/Release/net6.0/linux-x64/publish/"
+          target: "~/backend"
+
+      - name: Copy Frontend
+        uses: appleboy/scp-action@v0.1.4
+        with:
+          host: 194.182.190.208
+          username: ubuntu
+          key: ${{ secrets.PRODUCTION_SSH_KEY }}
+          source: "${{ gitea.workspace }}/typescript/frontend-marios2/"
+          target: "~/frontend"
+
+      - name: restart services
+        uses: appleboy/ssh-action@v0.1.4
+        with:
+          host: 194.182.190.208
+          username: ubuntu
+          password: ${{ secrets.PRODUCTION_SSH_PASSPHRASE }}
+          script: |
+            sudo systemctl restart backend
+            sudo cp -rf~/frontend/build/* /var/www/html/monitor.innov.energy/html/
+            sudo npm install -g serve
\ No newline at end of file
diff --git a/.gitea/workflows/stage-deploy.yaml b/.gitea/workflows/stage-deploy.yaml
index f26808956..dd6e38cec 100644
--- a/.gitea/workflows/stage-deploy.yaml
+++ b/.gitea/workflows/stage-deploy.yaml
@@ -8,8 +8,6 @@ jobs:
   Build-and-deploy-Stage:
     runs-on: ubuntu-latest
     steps:
-      - run: echo " The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo " The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
       - name: Check out repository code
         uses: actions/checkout@v3
       - run: echo " The ${{ gitea.repository }} repository has been cloned to the runner."
@@ -46,35 +44,6 @@ jobs:
           username: ubuntu
           password: ${{ secrets.STAGE_SSH_PASSPHRASE }}
           script: |
-             sudo systemctl restart backend
-             sudo cp -rf ~/frontend/build/*
-             sudo npm install -g serve/var/www/html/monitor.innov.energy/html/
-             
-      - run: echo " This job's status is ${{ job.status }}."
-      
-      
-      
-#      - name: Configure SSH
-#        run: |
-#          mkdir -p /root/.ssh/
-#          touch /root/.ssh/config
-#          echo '$SSH_KEY' > /root/.ssh/id_rsa
-#          chmod 700 /root/.ssh/id_rsa
-#          
-#          cat >> /root/.ssh/config <<END
-#          Host staging
-#            HostName $SSH_HOST
-#            User $SSH_USER
-#            IdentityFile /root/.ssh/id_rsa
-#            StrictHostKeyChecking no
-#          END
-#        env:
-#          SSH_USER: ubuntu
-#          SSH_HOST: 91.92.154.141
-#          SSS_KEY: ${{ secrets.STAGING_SSH_KEY }}
-#      - run: scp -vo StrictHostKeyChecking=no -r ${{ gitea.workspace }}/csharp/App/Backend/bin/Release/net6.0/linux-x64/publish/ staging:~/backend
-#      - run: scp -vo StrictHostKeyChecking=no -r ${{ gitea.workspace }}/typescript/frontend-marios2/*  staging:~/frontend/ 
-#      - run: ssh -vo StrictHostKeyChecking=no staging 'sudo systemctl restart backend'
-#      - run: ssh -vo StrictHostKeyChecking=no staging 'sudo cp -rf ~/frontend/build/* /var/www/html/monitor.innov.energy/html/'
-#      - run: ssh -vo StrictHostKeyChecking=no staging 'sudo npm install -g serve'
-#      - run: echo " This job's status is ${{ job.status }}."
\ No newline at end of file
+            sudo systemctl restart backend
+            sudo cp -rf~/frontend/build/* /var/www/html/monitor.innov.energy/html/
+            sudo npm install -g serve
\ No newline at end of file