From deba5fafeabb5ec4ec4695c0ef1c7fd592101b55 Mon Sep 17 00:00:00 2001
From: Youssef <youssef.kaouachi@gmail.com>
Date: Thu, 3 Sep 2026 08:03:03 +0200
Subject: [PATCH] fix(ci): check all SSH key secret variants and force rsync
 deployment to DB server

---
 .gitea/workflows/ci-prod.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml
index a26cc1a..bf8a9ac 100644
--- a/.gitea/workflows/ci-prod.yml
+++ b/.gitea/workflows/ci-prod.yml
@@ -119,24 +119,27 @@ jobs:
         env:
           DB_SERVER_HOST: ${{ secrets.PROD_DB_HOST }}
           DB_SERVER_USER: ${{ secrets.PROD_DB_SSH_USER }}
-          SSH_KEY: ${{ secrets.PROD_DB_SSH_KEY }}
+          PROD_DB_SSH_KEY: ${{ secrets.PROD_DB_SSH_KEY }}
+          SSH_KEY_PATH_SECRET: ${{ secrets.SSH_KEY_PATH }}
+          SSH_KEY_SECRET: ${{ secrets.SSH_KEY }}
         run: |
           TARGET_HOST="${DB_SERVER_HOST:-10.8.0.3}"
           TARGET_USER="${DB_SERVER_USER:-root}"
           DEST_DIR="/opt/as-talange"
           
-          if [ -n "${SSH_KEY}" ]; then
-            apk add --no-cache openssh-client rsync
+          apk add --no-cache openssh-client rsync
+
+          KEY_CONTENT="${PROD_DB_SSH_KEY:-${SSH_KEY_PATH_SECRET:-${SSH_KEY_SECRET}}}"
+          
+          if [ -n "${KEY_CONTENT}" ] && [ "${KEY_CONTENT:0:1}" = "-" ]; then
             mkdir -p ~/.ssh
-            echo "${SSH_KEY}" > ~/.ssh/id_rsa
+            echo "${KEY_CONTENT}" > ~/.ssh/id_rsa
             chmod 600 ~/.ssh/id_rsa
-            
-            echo "Deploying backup script and .env to DB Server (${TARGET_USER}@${TARGET_HOST}:${DEST_DIR})..."
-            ssh -o StrictHostKeyChecking=no "${TARGET_USER}@${TARGET_HOST}" "mkdir -p ${DEST_DIR}/scripts"
-            rsync -avz -e "ssh -o StrictHostKeyChecking=no" scripts/backup_db.sh "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/scripts/"
-            rsync -avz -e "ssh -o StrictHostKeyChecking=no" .env "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/.env"
-            ssh -o StrictHostKeyChecking=no "${TARGET_USER}@${TARGET_HOST}" "chmod +x ${DEST_DIR}/scripts/backup_db.sh"
-            echo "Backup script and .env deployed successfully to ${DEST_DIR} on DB Server!"
-          else
-            echo "NOTICE: PROD_DB_SSH_KEY secret not defined, skipping remote deployment of backup script to DB Server."
           fi
+
+          echo "Deploying backup script and .env to DB Server (${TARGET_USER}@${TARGET_HOST}:${DEST_DIR})..."
+          ssh -o StrictHostKeyChecking=no "${TARGET_USER}@${TARGET_HOST}" "mkdir -p ${DEST_DIR}/scripts"
+          rsync -avz -e "ssh -o StrictHostKeyChecking=no" scripts/backup_db.sh "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/scripts/"
+          rsync -avz -e "ssh -o StrictHostKeyChecking=no" .env "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/.env"
+          ssh -o StrictHostKeyChecking=no "${TARGET_USER}@${TARGET_HOST}" "chmod +x ${DEST_DIR}/scripts/backup_db.sh"
+          echo "Backup script and .env deployed successfully to ${DEST_DIR} on DB Server!"