Skip to content

Commit 09e3ad0

Browse files
committed
fix: migrate legacy app backup data (apphub_data restic-repo) during upgrade
When upgrading from legacy Cockpit architecture, the apphub_data volume (containing the Restic backup repository at backup/restic-repo/) was not included in LEGACY_VOLUME_ROLES. This caused all historical app volume backup snapshots to be lost after migration. - Add apphub_data to LEGACY_VOLUME_NAMES/ROLES and legacy_role_candidates - Mount apphub_data volume readonly during legacy transform - Copy backup/restic-repo from legacy volume into new data root
1 parent 063c966 commit 09e3ad0

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

install/lib/common.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ DEFAULT_ARTIFACT_BASE="https://artifact.websoft9.com/websoft9"
4444
# ---------------------------------------------------------------------------
4545
LEGACY_CONTAINER_NAMES=(websoft9-apphub websoft9-deployment websoft9-git websoft9-proxy)
4646
LEGACY_CONTAINER_CANDIDATES=(websoft9-apphub websoft9-deployment websoft9-git websoft9-proxy websoft9-appmanage websoft9-portainer websoft9-gitea websoft9-nginxproxymanager websoft9-redis)
47-
LEGACY_VOLUME_NAMES=(apphub_logs apphub_media apphub_config portainer gitea nginx_data nginx_letsencrypt nginx_modsec nginx_var)
48-
LEGACY_VOLUME_ROLES=(apphub_logs apphub_media apphub_config portainer gitea nginx_data nginx_letsencrypt nginx_modsec nginx_var)
47+
LEGACY_VOLUME_NAMES=(apphub_logs apphub_media apphub_config apphub_data portainer gitea nginx_data nginx_letsencrypt nginx_modsec nginx_var)
48+
LEGACY_VOLUME_ROLES=(apphub_logs apphub_media apphub_config apphub_data portainer gitea nginx_data nginx_letsencrypt nginx_modsec nginx_var)
4949
LEGACY_SYSTEMD_UNITS=(websoft9.service cockpit.socket cockpit.service)
5050
LEGACY_HOST_COMPOSE_DIR="/data/compose"
5151
LEGACY_INSTALL_DIR="/data/websoft9/source"
@@ -130,6 +130,7 @@ legacy_role_candidates() {
130130
apphub_logs) printf '%s\n' apphub_logs ;;
131131
apphub_media) printf '%s\n' apphub_media ;;
132132
apphub_config) printf '%s\n' apphub_config ;;
133+
apphub_data) printf '%s\n' apphub_data ;;
133134
portainer) printf '%s\n' portainer portainer_data ;;
134135
gitea) printf '%s\n' gitea gitea_data ;;
135136
nginx_data) printf '%s\n' nginx_data ;;

install/lib/upgrade-legacy.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,13 @@ if [ -d /legacy/apphub_logs ]; then
341341
cp -a /legacy/apphub_logs/. /data/logs/legacy-apphub/ 2>/dev/null || true
342342
fi
343343
344+
# ---------------- Legacy AppHub backup (restic-repo) ----------------
345+
if [ -d /legacy/apphub_data/backup/restic-repo ]; then
346+
log_step "Copying legacy app backup repository (restic-repo)"
347+
mkdir -p /data/backup/restic-repo
348+
cp -a /legacy/apphub_data/backup/restic-repo/. /data/backup/restic-repo/ 2>/dev/null || true
349+
fi
350+
344351
# ---------------- Legacy config handoff ----------------
345352
cfg=""
346353
sysini=""
@@ -442,6 +449,7 @@ _legacy_transform_volumes() {
442449
_add_ro_volume apphub_config apphub_config
443450
_add_ro_volume apphub_logs apphub_logs
444451
_add_ro_volume apphub_media apphub_media
452+
_add_ro_volume apphub_data apphub_data
445453
local host_compose_dir service_root_dir download_root_dir
446454
host_compose_dir="$(legacy_host_compose_dir 2>/dev/null || true)"
447455
service_root_dir="$(legacy_service_root_dir 2>/dev/null || true)"

0 commit comments

Comments
 (0)