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

fix: include UNRAID_COMPOSE_DIR in variable requirements and update Caddy paths in phase8_teardown.sh

Browse Source
This commit is contained in:
S
2026-03-02 11:44:02 -05:00
parent 285f83c897
commit 9b9cd1d289
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phase8_teardown.sh
View File

@@ -46,7 +46,7 @@ confirm_action() {
} }
load_env load_env
require_vars UNRAID_IP UNRAID_SSH_USER \ require_vars UNRAID_IP UNRAID_SSH_USER UNRAID_COMPOSE_DIR \
GITEA_DOMAIN CADDY_DATA_PATH \ GITEA_DOMAIN CADDY_DATA_PATH \
GITHUB_USERNAME GITHUB_TOKEN \ GITHUB_USERNAME GITHUB_TOKEN \
REPO_NAMES REPO_NAMES
@@ -55,6 +55,7 @@ log_warn "=== Phase 8 Teardown: Cutover ==="
read -ra REPOS <<< "$REPO_NAMES" read -ra REPOS <<< "$REPO_NAMES"
PHASE8_STATE_FILE="$(_project_root)/.manifests/phase8_github_repo_state.json" PHASE8_STATE_FILE="$(_project_root)/.manifests/phase8_github_repo_state.json"
CADDY_COMPOSE_DIR="${UNRAID_COMPOSE_DIR}/caddy"
github_pages_http_code() { github_pages_http_code() {
local repo="$1" local repo="$1"
@@ -70,7 +71,7 @@ github_pages_http_code() {
CONTAINER_STATUS=$(ssh_exec UNRAID "docker ps --filter name=caddy --format '{{.Status}}'" 2>/dev/null || true) CONTAINER_STATUS=$(ssh_exec UNRAID "docker ps --filter name=caddy --format '{{.Status}}'" 2>/dev/null || true)
if [[ "$CONTAINER_STATUS" == *"Up"* ]]; then if [[ "$CONTAINER_STATUS" == *"Up"* ]]; then
if confirm_action 'Stop and remove Caddy container? [y/N] '; then if confirm_action 'Stop and remove Caddy container? [y/N] '; then
ssh_exec UNRAID "cd '${CADDY_DATA_PATH}' && docker compose down 2>/dev/null || docker-compose down" ssh_exec UNRAID "cd '${CADDY_COMPOSE_DIR}' && docker compose down 2>/dev/null || docker-compose down"
log_success "Caddy container stopped and removed" log_success "Caddy container stopped and removed"
else else
log_info "Caddy container preserved" log_info "Caddy container preserved"
@@ -79,12 +80,16 @@ else
log_info "Caddy container not running" log_info "Caddy container not running"
fi fi
# Remove Caddy compose + Caddyfile # Remove Caddy compose file from compose dir; Caddyfile stays in data dir
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
ssh_exec UNRAID "rm -f '${CADDY_DATA_PATH}/docker-compose.yml' '${CADDY_DATA_PATH}/Caddyfile'" ssh_exec UNRAID "rm -f '${CADDY_COMPOSE_DIR}/docker-compose.yml'"
log_success "Removed Caddy config files" log_success "Removed Caddy compose file from ${CADDY_COMPOSE_DIR}"
else else
log_info "Caddy config files already removed" log_info "Caddy compose file already removed"
fi
if ssh_exec UNRAID "test -f '${CADDY_DATA_PATH}/Caddyfile'" 2>/dev/null; then
ssh_exec UNRAID "rm -f '${CADDY_DATA_PATH}/Caddyfile'"
log_success "Removed Caddyfile from ${CADDY_DATA_PATH}"
fi fi
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------