Preserve retired proxy state during migration

This commit is contained in:
Frank
2026-08-25 22:02:14 -07:00
parent 29af0c751f
commit 786ef4a5cf
2 changed files with 10 additions and 0 deletions
+9
View File
@@ -248,6 +248,14 @@ deploy_homepage() {
run_privileged python3 /usr/local/bin/homepage-status.py /srv/homepage/services.json /srv/homepage/status.json run_privileged python3 /usr/local/bin/homepage-status.py /srv/homepage/services.json /srv/homepage/status.json
} }
stage_legacy_gitea_caddy_state() {
local legacy_state="$STATE_DIR/gitea-caddy"
[[ -e "$legacy_state" ]] || return 0
local legacy_trash="$HOME/.AGENTTRASH/$(date +%Y%m%d)-gitea-caddy"
mkdir -p "$legacy_trash"
mv -- "$legacy_state" "$legacy_trash/gitea-caddy.state"
}
retire_legacy_gitea_caddy() { retire_legacy_gitea_caddy() {
# The old split proxy owns ports 80/443 on hosts upgraded in place. Stop # The old split proxy owns ports 80/443 on hosts upgraded in place. Stop
# and disable its generated unit before the canonical Caddy is started. # and disable its generated unit before the canonical Caddy is started.
@@ -272,6 +280,7 @@ retire_legacy_gitea_caddy() {
mv -- "$unit_file" "$legacy_trash/" mv -- "$unit_file" "$legacy_trash/"
fi fi
done done
stage_legacy_gitea_caddy_state
systemctl --user daemon-reload systemctl --user daemon-reload
if podman container exists gitea-caddy; then if podman container exists gitea-caddy; then
podman rm --force gitea-caddy podman rm --force gitea-caddy
+1
View File
@@ -122,6 +122,7 @@ REMOTE_DEPLOY="$REPO_ROOT/scripts/deploy-remote.sh"
grep -q 'systemctl --user disable gitea-caddy.service' "$REMOTE_DEPLOY" grep -q 'systemctl --user disable gitea-caddy.service' "$REMOTE_DEPLOY"
grep -q 'gitea-caddy.container' "$REMOTE_DEPLOY" grep -q 'gitea-caddy.container' "$REMOTE_DEPLOY"
grep -q 'HOME/.AGENTTRASH' "$REMOTE_DEPLOY" grep -q 'HOME/.AGENTTRASH' "$REMOTE_DEPLOY"
grep -q 'stage_legacy_gitea_caddy_state' "$REMOTE_DEPLOY"
} }
@test "remote deployment inventory no longer accepts gitea-caddy as a service" { @test "remote deployment inventory no longer accepts gitea-caddy as a service" {