From 786ef4a5cf7fb773e06150655e8d32c94ee28f02 Mon Sep 17 00:00:00 2001
From: Frank <frank@dankware>
Date: Tue, 25 Aug 2026 22:02:14 -0700
Subject: [PATCH] Preserve retired proxy state during migration

---
 scripts/deploy-remote.sh      | 9 +++++++++
 tests/deployment_scoping.bats | 1 +
 2 files changed, 10 insertions(+)

diff --git a/scripts/deploy-remote.sh b/scripts/deploy-remote.sh
index bb706ea..da8b069 100755
--- a/scripts/deploy-remote.sh
+++ b/scripts/deploy-remote.sh
@@ -248,6 +248,14 @@ deploy_homepage() {
     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() {
     # 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.
@@ -272,6 +280,7 @@ retire_legacy_gitea_caddy() {
             mv -- "$unit_file" "$legacy_trash/"
         fi
     done
+    stage_legacy_gitea_caddy_state
     systemctl --user daemon-reload
     if podman container exists gitea-caddy; then
         podman rm --force gitea-caddy
diff --git a/tests/deployment_scoping.bats b/tests/deployment_scoping.bats
index 6c2f05a..8f06c4e 100644
--- a/tests/deployment_scoping.bats
+++ b/tests/deployment_scoping.bats
@@ -122,6 +122,7 @@ REMOTE_DEPLOY="$REPO_ROOT/scripts/deploy-remote.sh"
     grep -q 'systemctl --user disable gitea-caddy.service' "$REMOTE_DEPLOY"
     grep -q 'gitea-caddy.container' "$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" {