privacy-in-design/gitea-migration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: include FEDORA_COMPOSE_DIR in variable requirements and update paths in phase2_gitea_fedora.sh

Browse Source
This commit is contained in:
S
2026-03-02 11:43:00 -05:00
parent efff379b80
commit 5ba53e11a3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phase2_gitea_fedora.sh
View File

@@ -12,6 +12,7 @@ source "${SCRIPT_DIR}/lib/common.sh"
load_env load_env
require_vars FEDORA_IP FEDORA_SSH_USER FEDORA_SSH_PORT FEDORA_GITEA_DATA_PATH \ require_vars FEDORA_IP FEDORA_SSH_USER FEDORA_SSH_PORT FEDORA_GITEA_DATA_PATH \
FEDORA_COMPOSE_DIR \
FEDORA_MACVLAN_PARENT FEDORA_MACVLAN_SUBNET FEDORA_MACVLAN_GATEWAY \ FEDORA_MACVLAN_PARENT FEDORA_MACVLAN_SUBNET FEDORA_MACVLAN_GATEWAY \
FEDORA_MACVLAN_IP_RANGE FEDORA_GITEA_IP \ FEDORA_MACVLAN_IP_RANGE FEDORA_GITEA_IP \
GITEA_ADMIN_USER GITEA_ADMIN_PASSWORD GITEA_ADMIN_EMAIL \ GITEA_ADMIN_USER GITEA_ADMIN_PASSWORD GITEA_ADMIN_EMAIL \
@@ -26,6 +27,8 @@ phase_header 2 "Gitea on Fedora (Backup)"
# Alias for template rendering — same template as Phase 1, different values # Alias for template rendering — same template as Phase 1, different values
DATA_PATH="$FEDORA_GITEA_DATA_PATH" DATA_PATH="$FEDORA_GITEA_DATA_PATH"
# Compose files live in a centralized project directory on each host.
COMPOSE_DIR="${FEDORA_COMPOSE_DIR}/gitea"
FEDORA_DOCKER_NETWORK_NAME="gitea_net" FEDORA_DOCKER_NETWORK_NAME="gitea_net"
# DB helpers and strip_template_block are in lib/common.sh # DB helpers and strip_template_block are in lib/common.sh
@@ -66,9 +69,10 @@ fi
# Uses the same template as Phase 1 but with Fedora-specific values. # Uses the same template as Phase 1 but with Fedora-specific values.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
log_step 3 "Deploying docker-compose.yml..." log_step 3 "Deploying docker-compose.yml..."
if ssh_exec FEDORA "test -f '${DATA_PATH}/docker-compose.yml'"; then if ssh_exec FEDORA "test -f '${COMPOSE_DIR}/docker-compose.yml'"; then
log_info "docker-compose.yml already exists — skipping" log_info "docker-compose.yml already exists — skipping"
else else
ssh_exec FEDORA "mkdir -p '${COMPOSE_DIR}'"
TMPFILE=$(mktemp) TMPFILE=$(mktemp)
GITEA_CONTAINER_IP="${FEDORA_GITEA_IP}" GITEA_CONTAINER_IP="${FEDORA_GITEA_IP}"
GITEA_NETWORK_NAME="${FEDORA_DOCKER_NETWORK_NAME}" GITEA_NETWORK_NAME="${FEDORA_DOCKER_NETWORK_NAME}"
@@ -87,9 +91,9 @@ else
"\${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} \${DB_CONTAINER_IP}"
fi fi
scp_to FEDORA "$TMPFILE" "${DATA_PATH}/docker-compose.yml" scp_to FEDORA "$TMPFILE" "${COMPOSE_DIR}/docker-compose.yml"
rm -f "$TMPFILE" rm -f "$TMPFILE"
log_success "docker-compose.yml deployed" log_success "docker-compose.yml deployed to ${COMPOSE_DIR}"
fi fi
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -133,7 +137,7 @@ if [[ "$CONTAINER_STATUS" == *"Up"* ]]; then
log_info "Gitea container already running — skipping" log_info "Gitea container already running — skipping"
else else
# Try "docker compose" plugin first, fall back to standalone # Try "docker compose" plugin first, fall back to standalone
ssh_exec FEDORA "cd '${DATA_PATH}' && docker compose up -d 2>/dev/null || docker-compose up -d" ssh_exec FEDORA "cd '${COMPOSE_DIR}' && docker compose up -d 2>/dev/null || docker-compose up -d"
log_success "Gitea container started" log_success "Gitea container started"
fi fi