From 881a81f53bc9e89a2190e5e5a04134a3456d9720 Mon Sep 17 00:00:00 2001
From: Youssef <youssef.kaouachi@gmail.com>
Date: Thu, 3 Sep 2026 14:49:33 +0200
Subject: [PATCH] fix(ci): robust SSH key resolution supporting both file paths
 and Gitea secrets

---
 .gitea/workflows/ci-prod.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml
index 173666f..b692480 100644
--- a/.gitea/workflows/ci-prod.yml
+++ b/.gitea/workflows/ci-prod.yml
@@ -120,23 +120,41 @@ jobs:
           DB_SERVER_HOST: ${{ secrets.PROD_DB_HOST }}
           DB_SERVER_USER: ${{ secrets.PROD_DB_SSH_USER }}
           REMOTE_PORT: ${{ secrets.REMOTE_PORT }}
+          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}"
           PORT="${REMOTE_PORT:-22}"
           DEST_DIR="/opt/as-talange"
+          KEY_CONTENT="${PROD_DB_SSH_KEY:-${SSH_KEY_PATH_SECRET:-${SSH_KEY_SECRET}}}"
 
           docker run --rm --net=host \
             -v "$(pwd):/workspace" -w /workspace \
+            -v "/home/ubuntu/.ssh:/home/ubuntu/.ssh:ro" \
             -v "/root/.ssh:/root/.ssh:ro" \
             -e TARGET_HOST="${TARGET_HOST}" \
             -e TARGET_USER="${TARGET_USER}" \
             -e PORT="${PORT}" \
             -e DEST_DIR="${DEST_DIR}" \
+            -e KEY_CONTENT="${KEY_CONTENT}" \
             alpine:latest sh -c '
               apk add --no-cache openssh-client rsync && \
               mkdir -p ~/.ssh && \
-              cp /root/.ssh/gitea_ci_key ~/.ssh/id_rsa && \
+              FOUND_KEY="" && \
+              for k in /home/ubuntu/.ssh/gitea_ci_key /root/.ssh/gitea_ci_key /home/ubuntu/.ssh/id_ed25519 /root/.ssh/id_ed25519 /home/ubuntu/.ssh/id_rsa /root/.ssh/id_rsa; do \
+                if [ -f "$k" ]; then FOUND_KEY="$k"; break; fi ; \
+              done && \
+              if [ -n "$FOUND_KEY" ]; then \
+                echo "Using SSH key from file: $FOUND_KEY" && \
+                cp "$FOUND_KEY" ~/.ssh/id_rsa ; \
+              elif [ -n "$KEY_CONTENT" ]; then \
+                echo "Using SSH key from Gitea secret" && \
+                printf "%s\n" "$KEY_CONTENT" | tr -d "\r" > ~/.ssh/id_rsa ; \
+              else \
+                echo "ERROR: No SSH key found!" && exit 1 ; \
+              fi && \
               chmod 600 ~/.ssh/id_rsa && \
               SSH_CMD="ssh -p ${PORT} -i ~/.ssh/id_rsa -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=15" && \
               echo "Deploying backup script and .env to DB Server (${TARGET_USER}@${TARGET_HOST}:${DEST_DIR})..." && \