From d5edc4d49b5dbcec5bd7b684d85a99d78c18104d Mon Sep 17 00:00:00 2001
From: S <islam.ahmad@outlook.com>
Date: Mon, 2 Mar 2026 10:38:54 -0500
Subject: [PATCH] fix: update Docker network variable usage for consistency in
 Fedora deployment script

---
 phase2_gitea_fedora.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/phase2_gitea_fedora.sh b/phase2_gitea_fedora.sh
index 93ff842..30dba9f 100755
--- a/phase2_gitea_fedora.sh
+++ b/phase2_gitea_fedora.sh
@@ -27,6 +27,7 @@ phase_header 2 "Gitea on Fedora (Backup)"
 
 # Alias for template rendering — same template as Phase 1, different values
 DATA_PATH="$FEDORA_GITEA_DATA_PATH"
+FEDORA_DOCKER_NETWORK_NAME="gitea_net"
 
 # DB helpers and strip_template_block are in lib/common.sh
 
@@ -48,8 +49,8 @@ fi
 # Step 2: Create macvlan Docker network (idempotent)
 # ---------------------------------------------------------------------------
 log_step 2 "Creating macvlan Docker network on Fedora..."
-if ssh_exec FEDORA "docker network inspect gitea_net" &>/dev/null; then
-  log_info "gitea_net network already exists — skipping"
+if ssh_exec FEDORA "docker network inspect '${FEDORA_DOCKER_NETWORK_NAME}'" &>/dev/null; then
+  log_info "${FEDORA_DOCKER_NETWORK_NAME} network already exists — skipping"
 else
   ssh_exec FEDORA "docker network create \
     --driver macvlan \
@@ -57,8 +58,8 @@ else
     --gateway='${FEDORA_MACVLAN_GATEWAY}' \
     --ip-range='${FEDORA_MACVLAN_IP_RANGE}' \
     -o parent='${FEDORA_MACVLAN_PARENT}' \
-    gitea_net"
-  log_success "macvlan network gitea_net created"
+    '${FEDORA_DOCKER_NETWORK_NAME}'"
+  log_success "macvlan network ${FEDORA_DOCKER_NETWORK_NAME} created"
 fi
 
 # ---------------------------------------------------------------------------
@@ -71,11 +72,12 @@ if ssh_exec FEDORA "test -f '${DATA_PATH}/docker-compose.yml'"; then
 else
   TMPFILE=$(mktemp)
   GITEA_CONTAINER_IP="${FEDORA_GITEA_IP}"
-  export DATA_PATH GITEA_CONTAINER_IP
+  GITEA_NETWORK_NAME="${FEDORA_DOCKER_NETWORK_NAME}"
+  export DATA_PATH GITEA_CONTAINER_IP GITEA_NETWORK_NAME
 
   if [[ "$GITEA_DB_TYPE" == "sqlite3" ]]; then
     render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \
-      "\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP}"
+      "\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${GITEA_NETWORK_NAME}"
     strip_template_block "$TMPFILE" "DB_SERVICE_START" "DB_SERVICE_END"
     strip_template_block "$TMPFILE" "DB_DEPENDS_START" "DB_DEPENDS_END"
   else
@@ -83,7 +85,7 @@ else
     DB_CONTAINER_IP="${FEDORA_DB_IP}"
     export DB_CONTAINER_IP
     render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \
-      "\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${DB_DOCKER_IMAGE} \${DB_ENV_VARS} \${DB_DATA_DIR} \${DB_HEALTHCHECK} \${DB_CONTAINER_IP}"
+      "\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${GITEA_NETWORK_NAME} \${DB_DOCKER_IMAGE} \${DB_ENV_VARS} \${DB_DATA_DIR} \${DB_HEALTHCHECK} \${DB_CONTAINER_IP}"
   fi
 
   scp_to FEDORA "$TMPFILE" "${DATA_PATH}/docker-compose.yml"