diff --git a/phase8_cutover.sh b/phase8_cutover.sh index 67084cb..8f57b5a 100755 --- a/phase8_cutover.sh +++ b/phase8_cutover.sh @@ -18,6 +18,7 @@ source "${SCRIPT_DIR}/lib/common.sh" load_env require_vars UNRAID_IP UNRAID_SSH_USER UNRAID_GITEA_IP UNRAID_CADDY_IP \ + UNRAID_COMPOSE_DIR \ GITEA_INTERNAL_URL GITEA_DOMAIN GITEA_ADMIN_TOKEN \ GITEA_ORG_NAME TLS_MODE CADDY_DOMAIN CADDY_DATA_PATH \ GITHUB_USERNAME GITHUB_TOKEN \ @@ -39,6 +40,8 @@ PHASE8_STATE_DIR="$(_project_root)/.manifests" PHASE8_STATE_FILE="${PHASE8_STATE_DIR}/phase8_github_repo_state.json" # Reuse Unraid's existing Docker network. UNRAID_DOCKER_NETWORK_NAME="br0" +# Compose files live in a centralized project directory. +CADDY_COMPOSE_DIR="${UNRAID_COMPOSE_DIR}/caddy" # --------------------------------------------------------------------------- # Helper: persist original GitHub repo settings for teardown symmetry @@ -170,7 +173,7 @@ fi # Step 3: Render + deploy Caddy docker-compose # --------------------------------------------------------------------------- log_step 3 "Deploying Caddy docker-compose..." -if ssh_exec UNRAID "test -f '${CADDY_DATA_PATH}/docker-compose.yml'" 2>/dev/null; then +if ssh_exec UNRAID "test -f '${CADDY_COMPOSE_DIR}/docker-compose.yml'" 2>/dev/null; then log_info "Caddy docker-compose.yml already exists — skipping" else if ! ssh_exec UNRAID "docker network inspect '${UNRAID_DOCKER_NETWORK_NAME}'" &>/dev/null; then @@ -178,6 +181,7 @@ else log_error "Create it in Unraid first or update phase8_cutover.sh to match your network name." exit 1 fi + ssh_exec UNRAID "mkdir -p '${CADDY_COMPOSE_DIR}'" TMPFILE=$(mktemp) CADDY_CONTAINER_IP="${UNRAID_CADDY_IP}" GITEA_NETWORK_NAME="${UNRAID_DOCKER_NETWORK_NAME}" @@ -206,9 +210,9 @@ else sed -i.bak -e :a -e '/^\n*$/{$d;N;ba' -e '}' "$TMPFILE" rm -f "${TMPFILE}.bak" fi - scp_to UNRAID "$TMPFILE" "${CADDY_DATA_PATH}/docker-compose.yml" + scp_to UNRAID "$TMPFILE" "${CADDY_COMPOSE_DIR}/docker-compose.yml" rm -f "$TMPFILE" - log_success "Caddy docker-compose.yml deployed" + log_success "Caddy docker-compose.yml deployed to ${CADDY_COMPOSE_DIR}" fi # --------------------------------------------------------------------------- @@ -219,7 +223,7 @@ CONTAINER_STATUS=$(ssh_exec UNRAID "docker ps --filter name=caddy --format '{{.S if [[ "$CONTAINER_STATUS" == *"Up"* ]]; then log_info "Caddy container already running — skipping" else - ssh_exec UNRAID "cd '${CADDY_DATA_PATH}' && docker compose up -d 2>/dev/null || docker-compose up -d" + ssh_exec UNRAID "cd '${CADDY_COMPOSE_DIR}' && docker compose up -d 2>/dev/null || docker-compose up -d" log_success "Caddy container started" fi