diff --git a/.gitea/workflows/ci-prod.yml b/.gitea/workflows/ci-prod.yml index bf8a9ac..83a54eb 100644 --- a/.gitea/workflows/ci-prod.yml +++ b/.gitea/workflows/ci-prod.yml @@ -119,27 +119,31 @@ jobs: env: 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" 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 + if [ -n "${KEY_CONTENT}" ]; then mkdir -p ~/.ssh - echo "${KEY_CONTENT}" > ~/.ssh/id_rsa + printf "%s\n" "${KEY_CONTENT}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa 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" + SSH_CMD="ssh -p ${PORT} -o StrictHostKeyChecking=no -o ConnectTimeout=10" + + echo "Deploying backup script and .env to DB Server (${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}) on port ${PORT}..." + $SSH_CMD "${TARGET_USER}@${TARGET_HOST}" "mkdir -p ${DEST_DIR}/scripts" + rsync -avz -e "${SSH_CMD}" scripts/backup_db.sh "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/scripts/" + rsync -avz -e "${SSH_CMD}" .env "${TARGET_USER}@${TARGET_HOST}:${DEST_DIR}/.env" + $SSH_CMD "${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!"