fix: remove GITEA_DB_HOST and related references from Fedora deployment script

This commit is contained in:
S
2026-03-02 12:04:17 -05:00
parent 88ea0b4f1d
commit ab1d781ccc

View File

@@ -19,8 +19,7 @@ require_vars FEDORA_IP FEDORA_SSH_USER FEDORA_SSH_PORT FEDORA_GITEA_DATA_PATH \
GITEA_DB_TYPE GITEA_VERSION GITEA_DB_TYPE GITEA_VERSION
if [[ "${GITEA_DB_TYPE}" != "sqlite3" ]]; then if [[ "${GITEA_DB_TYPE}" != "sqlite3" ]]; then
require_vars GITEA_DB_HOST GITEA_DB_PORT GITEA_DB_NAME GITEA_DB_USER GITEA_DB_PASSWD \ require_vars GITEA_DB_PORT GITEA_DB_NAME GITEA_DB_USER GITEA_DB_PASSWD
FEDORA_DB_IP
fi fi
phase_header 2 "Gitea on Fedora (Backup)" phase_header 2 "Gitea on Fedora (Backup)"
@@ -79,16 +78,19 @@ else
export DATA_PATH GITEA_CONTAINER_IP GITEA_NETWORK_NAME export DATA_PATH GITEA_CONTAINER_IP GITEA_NETWORK_NAME
if [[ "$GITEA_DB_TYPE" == "sqlite3" ]]; then 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" \ render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \
"\${GITEA_VERSION} \${DATA_PATH} \${GITEA_CONTAINER_IP} \${GITEA_NETWORK_NAME}" "\${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_SERVICE_START" "DB_SERVICE_END"
strip_template_block "$TMPFILE" "DB_DEPENDS_START" "DB_DEPENDS_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 else
# External DB — set DB-specific vars then render
# DB container uses an internal bridge network (not exposed to LAN)
set_db_vars set_db_vars
DB_CONTAINER_IP="${FEDORA_DB_IP}"
export DB_CONTAINER_IP
render_template "${SCRIPT_DIR}/templates/docker-compose-gitea.yml.tpl" "$TMPFILE" \ 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 fi
scp_to FEDORA "$TMPFILE" "${COMPOSE_DIR}/docker-compose.yml" scp_to FEDORA "$TMPFILE" "${COMPOSE_DIR}/docker-compose.yml"
@@ -119,7 +121,7 @@ else
strip_template_block "$TMPFILE" "EXTDB_BLOCK_START" "EXTDB_BLOCK_END" strip_template_block "$TMPFILE" "EXTDB_BLOCK_START" "EXTDB_BLOCK_END"
else else
render_template "${SCRIPT_DIR}/templates/app.ini.tpl" "$TMPFILE" \ 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" strip_template_block "$TMPFILE" "SQLITE_BLOCK_START" "SQLITE_BLOCK_END"
fi fi