From 38024dc7bd7f95daa786a0e48a545eec17632c77 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:07:46 +0000 Subject: [PATCH 01/15] Update deploy.yml --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 561e577..30cf61b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,10 +20,10 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan 2.56.246.125 >> ~/.ssh/known_hosts + ssh-keyscan ${{ secrets.DEPLOY_SERVER_IP }} >> ~/.ssh/known_hosts - name: Deploy via rsync run: | rsync -av --delete \ --exclude='.git' \ - ./ git@2.56.246.125:/var/www/html/ + ./ git@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/html/ From 52e78a637e95d62e15d2cd560d9751eac5a06190 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:10:39 +0000 Subject: [PATCH 02/15] Update deploy.yml --- .github/workflows/deploy.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 30cf61b..4213dd9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,12 +18,12 @@ jobs: - name: Setup SSH run: | mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 + printf "%s\n" "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan ${{ secrets.DEPLOY_SERVER_IP }} >> ~/.ssh/known_hosts + ssh-keyscan -H ${{ secrets.DEPLOY_SERVER_IP }} >> ~/.ssh/known_hosts - - name: Deploy via rsync + + - name: Deploy jarvislandingpage run: | - rsync -av --delete \ - --exclude='.git' \ - ./ git@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/html/ + rsync -av --delete -e "ssh -i ~/.ssh/id_ed25519" \ + ./jarvislandingpage/ deploy@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/ From d90fa2db22ffdffba401e160f9cf8caeff823e8c Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:11:33 +0000 Subject: [PATCH 03/15] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4213dd9..bc8a321 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy Production on: push: branches: - - production + - Production jobs: deploy: From 8253f2753f2dda8b000c44a6fae86c489f02196f Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:12:20 +0000 Subject: [PATCH 04/15] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bc8a321..2217c0b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - ref: production + ref: Production - name: Setup SSH run: | From fec4e96122b5584c63ccae038173c85775993a64 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:13:11 +0000 Subject: [PATCH 05/15] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2217c0b..e77b5d0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H ${{ secrets.DEPLOY_SERVER_IP }} >> ~/.ssh/known_hosts - +# push to server - name: Deploy jarvislandingpage run: | rsync -av --delete -e "ssh -i ~/.ssh/id_ed25519" \ From 27b535cddfccd97bea417c761ffe2d2c31827d38 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:15:16 +0000 Subject: [PATCH 06/15] Update deploy.yml --- .github/workflows/deploy.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e77b5d0..777b2b4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy Production on: push: branches: - - Production + - Production # match your branch name exactly jobs: deploy: @@ -22,8 +22,11 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H ${{ secrets.DEPLOY_SERVER_IP }} >> ~/.ssh/known_hosts -# push to server + - name: Test SSH connection + run: | + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "echo SSH connection OK" + - name: Deploy jarvislandingpage run: | - rsync -av --delete -e "ssh -i ~/.ssh/id_ed25519" \ - ./jarvislandingpage/ deploy@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/ + rsync -av --delete -e "ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no" \ + ./jarvislandingpage/ ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/ From bb10cae5b500e0c477894e9af831f2fa53c9cf66 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:16:38 +0000 Subject: [PATCH 07/15] Update deploy.yml --- .github/workflows/deploy.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 777b2b4..2b9de4d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy Production +name: Deploy landing.html on: push: @@ -26,7 +26,12 @@ jobs: run: | ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "echo SSH connection OK" - - name: Deploy jarvislandingpage + - name: Deploy landing.html run: | - rsync -av --delete -e "ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no" \ - ./jarvislandingpage/ ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/ + # Ensure the target directory exists + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} \ + "mkdir -p /var/www/jarvislandingpage" + + # Copy only landing.html + scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ + ./jarvislandingpage/landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From 35527d95117c0c570bf2d37b4e82f8e2dc1c1098 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:18:39 +0000 Subject: [PATCH 08/15] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2b9de4d..abebce0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,4 +34,4 @@ jobs: # Copy only landing.html scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ - ./jarvislandingpage/landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html + ./landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From 7d5a7aaba3e8ccb3a37f87874f999420a52741dc Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:20:06 +0000 Subject: [PATCH 09/15] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index abebce0..100b676 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,4 +34,4 @@ jobs: # Copy only landing.html scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ - ./landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html + ./landing/landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From 87dc0be7e673618108e675dc91e3cc8242cd65a8 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:21:36 +0000 Subject: [PATCH 10/15] Update deploy.yml --- .github/workflows/deploy.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 100b676..e99e5e7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,14 +24,15 @@ jobs: - name: Test SSH connection run: | - ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "echo SSH connection OK" + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ + ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "echo SSH connection OK" - name: Deploy landing.html run: | # Ensure the target directory exists - ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} \ - "mkdir -p /var/www/jarvislandingpage" + ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ + ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "mkdir -p /var/www/jarvislandingpage" - # Copy only landing.html + # Copy only landing.html from repo root scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ - ./landing/landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html + ./landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From d52e71d235bd89f25ba639d495acd90bb0bcb50a Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:29:58 +0000 Subject: [PATCH 11/15] Update deploy.yml --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e99e5e7..9662c75 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,12 +27,12 @@ jobs: ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "echo SSH connection OK" - - name: Deploy landing.html + - name: Deploy index.html as landing.html run: | - # Ensure the target directory exists + # Ensure the target directory exists on the server ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "mkdir -p /var/www/jarvislandingpage" - # Copy only landing.html from repo root + # Copy index.html from repo root to landing.html on the server scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ - ./landing.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html + ./index.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From c3ad0604aac5d9c6781508ff8c56234883776ab1 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Tue, 23 Dec 2025 18:09:59 +0000 Subject: [PATCH 12/15] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9662c75..0afcb50 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy landing.html +name: Push to Production on: push: From 2cfe35ca8cd708a009dd026bc7f8bad435778105 Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Fri, 29 May 2026 10:03:37 +0100 Subject: [PATCH 13/15] Update deploy.yml --- .github/workflows/deploy.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0afcb50..99fe392 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Push to Production on: push: branches: - - Production # match your branch name exactly + - Production jobs: deploy: @@ -29,10 +29,11 @@ jobs: - name: Deploy index.html as landing.html run: | - # Ensure the target directory exists on the server + # Ensure the directory exists and set correct group permissions ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ - ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "mkdir -p /var/www/jarvislandingpage" + ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} \ + "sudo mkdir -p /var/www/jarvislandingpage && sudo chown -R ${{ secrets.DEPLOY_USER }}:www-data /var/www/jarvislandingpage && sudo chmod -R 775 /var/www/jarvislandingpage" - # Copy index.html from repo root to landing.html on the server - scp -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ + # Use rsync to upload the file; it is more robust than scp for web directories + rsync -avz -e "ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no" \ ./index.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From 832c8b6154748a87ac0e61ff0146582062aff94d Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Fri, 29 May 2026 10:04:39 +0100 Subject: [PATCH 14/15] Update deploy.yml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 99fe392..55d6ec3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,11 +29,11 @@ jobs: - name: Deploy index.html as landing.html run: | - # Ensure the directory exists and set correct group permissions + # Ensure the target directory exists ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} \ - "sudo mkdir -p /var/www/jarvislandingpage && sudo chown -R ${{ secrets.DEPLOY_USER }}:www-data /var/www/jarvislandingpage && sudo chmod -R 775 /var/www/jarvislandingpage" + "mkdir -p /var/www/jarvislandingpage" - # Use rsync to upload the file; it is more robust than scp for web directories + # Use rsync to upload the file; this works because 'jarvis' now owns the directory rsync -avz -e "ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no" \ ./index.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html From abcd7f0252fa9462eef26d04f606e7948a74cbfd Mon Sep 17 00:00:00 2001 From: Ben Cos <52817096+BenCos17@users.noreply.github.com> Date: Fri, 29 May 2026 10:14:12 +0100 Subject: [PATCH 15/15] Update deploy.yml --- .github/workflows/deploy.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 55d6ec3..6f0d547 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,18 +22,23 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H ${{ secrets.DEPLOY_SERVER_IP }} >> ~/.ssh/known_hosts - - name: Test SSH connection + # Step 1: Deploy Landing Page + - name: Deploy to Landing Directory run: | ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ - ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} "echo SSH connection OK" + ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} \ + "mkdir -p /var/www/jarvislandingpage" - - name: Deploy index.html as landing.html + rsync -avz -e "ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no" \ + ./index.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html + + # Step 2: Deploy Clusters Dashboard + # Assuming you have a separate file for the clusters page in your repo + - name: Deploy to Clusters Directory run: | - # Ensure the target directory exists ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no \ ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }} \ - "mkdir -p /var/www/jarvislandingpage" + "mkdir -p /var/www/clusters" - # Use rsync to upload the file; this works because 'jarvis' now owns the directory rsync -avz -e "ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no" \ - ./index.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/jarvislandingpage/landing.html + ./clusters.html ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_SERVER_IP }}:/var/www/clusters/index.html