From ab1d781cccdf5d4e617ec84e162b0b50b0b7eb69 Mon Sep 17 00:00:00 2001
From: S <islam.ahmad@outlook.com>
Date: Mon, 2 Mar 2026 12:04:17 -0500
Subject: [PATCH] fix: remove GITEA_DB_HOST and related references from Fedora
 deployment script

---
 phase2_gitea_fedora.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/phase2_gitea_fedora.sh b/phase2_gitea_fedora.sh
index 9f03f33..531c006 100755
--- a/phase2_gitea_fedora.sh
+++ b/phase2_gitea_fedora.sh
@@ -19,8 +19,7 @@ require_vars FEDORA_IP FEDORA_SSH_USER FEDORA_SSH_PORT FEDORA_GITEA_DATA_PATH \
              GITEA_DB_TYPE GITEA_VERSION
 
 if [[ "${GITEA_DB_TYPE}" != "sqlite3" ]]; then
-  require_vars GITEA_DB_HOST GITEA_DB_PORT GITEA_DB_NAME GITEA_DB_USER GITEA_DB_PASSWD \
-               FEDORA_DB_IP
+  require_vars GITEA_DB_PORT GITEA_DB_NAME GITEA_DB_USER GITEA_DB_PASSWD
 fi
 
 phase_header 2 "Gitea on Fedora (Backup)"
@@ -79,16 +78,19 @@ else
   export DATA_PATH GITEA_CONTAINER_IP GITEA_NETWORK_NAME
 
   if [[ "$GITEA_DB_TYPE" == "sqlite3" ]]; then
+    # No DB service needed — render template then strip DB + internal network blocks
     render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \
       "\${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"
+    strip_template_block "$TMPFILE" "INTERNAL_NET_REF_START" "INTERNAL_NET_REF_END"
+    strip_template_block "$TMPFILE" "INTERNAL_NET_DEF_START" "INTERNAL_NET_DEF_END"
   else
+    # External DB — set DB-specific vars then render
+    # DB container uses an internal bridge network (not exposed to LAN)
     set_db_vars
-    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} \${GITEA_NETWORK_NAME} \${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}"
   fi
 
   scp_to FEDORA "$TMPFILE" "${COMPOSE_DIR}/docker-compose.yml"
@@ -119,7 +121,7 @@ else
     strip_template_block "$TMPFILE" "EXTDB_BLOCK_START" "EXTDB_BLOCK_END"
   else
     render_template "${SCRIPT_DIR}/templates/app.ini.tpl" "$TMPFILE" \
-      "\${GITEA_DOMAIN} \${GITEA_DB_TYPE} \${GITEA_SECRET_KEY} \${GITEA_DB_HOST} \${GITEA_DB_PORT} \${GITEA_DB_NAME} \${GITEA_DB_USER} \${GITEA_DB_PASSWD}"
+      "\${GITEA_DOMAIN} \${GITEA_DB_TYPE} \${GITEA_SECRET_KEY} \${GITEA_DB_PORT} \${GITEA_DB_NAME} \${GITEA_DB_USER} \${GITEA_DB_PASSWD}"
     strip_template_block "$TMPFILE" "SQLITE_BLOCK_START" "SQLITE_BLOCK_END"
   fi