diff --git a/roles/backup/templates/backup.sh.j2 b/roles/backup/templates/backup.sh.j2 index 9778918..f06de13 100644 --- a/roles/backup/templates/backup.sh.j2 +++ b/roles/backup/templates/backup.sh.j2 @@ -32,15 +32,6 @@ docker exec plane-db pg_dump -U plane plane \ | gzip > "${WORK_DIR}/data/databases/plane.sql.gz" log " → databases/plane.sql.gz ($(du -sh "${WORK_DIR}/data/databases/plane.sql.gz" | cut -f1))" -# ── Vaultwarden data volume ────────────────────────────────────────────────── -log "Backing up Vaultwarden data..." -docker run --rm \ - --volumes-from vaultwarden \ - -v "${WORK_DIR}/data/volumes:/backup" \ - alpine:3 \ - tar czf /backup/vaultwarden.tar.gz /data -log " → volumes/vaultwarden.tar.gz ($(du -sh "${WORK_DIR}/data/volumes/vaultwarden.tar.gz" | cut -f1))" - # ── Forgejo data volume (repos, attachments, LFS) ─────────────────────────── log "Backing up Forgejo data..." docker run --rm \ @@ -70,7 +61,7 @@ cat > "${WORK_DIR}/data/RESTORE.md" << 'RESTORE_EOF' ## Step 1 — Stop services that need data restored ```bash cd /opt/services -docker compose stop forgejo plane-api plane-web plane-admin plane-space plane-worker plane-beat uptime-kuma vaultwarden +docker compose stop forgejo plane-api plane-web plane-admin plane-space plane-worker plane-beat uptime-kuma docker compose stop forgejo-db plane-db ``` @@ -85,10 +76,6 @@ zcat data/databases/plane.sql.gz | docker exec -i plane-db psql -U plane plane ## Step 3 — Restore volume data ```bash -# Vaultwarden — extracts /data/ into the container -docker run --rm --volumes-from vaultwarden -v $(pwd)/data/volumes:/backup \ - alpine:3 sh -c "cd / && tar xzf /backup/vaultwarden.tar.gz" - # Forgejo — extracts /data/ into the container docker run --rm --volumes-from forgejo -v $(pwd)/data/volumes:/backup \ alpine:3 sh -c "cd / && tar xzf /backup/forgejo.tar.gz" diff --git a/roles/services/tasks/directories.yml b/roles/services/tasks/directories.yml index 70debc9..cb2a2f8 100644 --- a/roles/services/tasks/directories.yml +++ b/roles/services/tasks/directories.yml @@ -17,7 +17,6 @@ loop: - traefik - traefik/dynamic - - vaultwarden/data - forgejo/data - forgejo/db - plane/pgdata diff --git a/roles/services/tasks/main.yml b/roles/services/tasks/main.yml index c034103..60a054a 100644 --- a/roles/services/tasks/main.yml +++ b/roles/services/tasks/main.yml @@ -6,7 +6,6 @@ ansible.builtin.command: docker pull {{ item }} loop: - "{{ traefik_image }}" - - "{{ vaultwarden_image }}" - "{{ forgejo_image }}" - "{{ forgejo_db_image }}" - "{{ plane_frontend_image }}"