back up Gitea + Skudak app data; drop PartKeepr and Pi-hole

Extends the Nextcloud backup machinery rather than adding a second
mechanism. cloud-backup.sh.j2 gains three guarded options, all no-ops for
the existing callers:

  backup_podman_user  Gitea runs rootless under `git`, not `podman`
  backup_db_type      postgres (Gitea) and mysql (BookStack) alongside
                      mariadb; each engine's completion trailer differs,
                      and grepping for the wrong one fails every run
  backup_sqlite_dbs   `sqlite3 .backup` for live WAL-mode SQLite, gated on
                      `pragma integrity_check` before promotion -- rsync
                      is either stale (no -wal) or torn (with it)

New instances: gitea-debyl, skudak-gitea, bookstack, partsy-skudak. The
alert handler is rendered once and shared, so its wording is now generic
rather than per-product; TAG stays nextcloud-backup because an external
Graylog rule matches on it.

`apply:` on the includes is load-bearing -- tags on a dynamic
include_tasks do not reach the tasks inside it.

Business data (skudak-gitea, bookstack, partsy-skudak) goes to TrueNAS
and on to Skudak's own iDrive account; the personal bucket's
/skudak*/** excludes are permanent, not a stopgap.

Removals: PartKeepr is superseded by Partsy, and its teardown never
finished -- it targeted /etc/systemd/system/podman-partkeepr*.service,
wrong prefix and wrong scope, leaving enabled user units in failed state.
Pi-hole's role was already orphaned (absent from deploy_home.yml); its
port 53 rule went with it after confirming nothing listens there.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bastian de Byl
2026-07-30 18:08:47 -04:00
parent a63bf5edec
commit bc110ce69e
15 changed files with 236 additions and 129 deletions
@@ -1,14 +1,17 @@
#!/bin/bash
# {{ ansible_managed }}
# Nextcloud "{{ backup_name }}" -> truenas.localdomain.
# {{ backup_product | default('Nextcloud') }} "{{ backup_name }}" -> truenas.localdomain.
#
# Ordering is deliberate: the database is dumped BEFORE the file tree is
# synced. A DB snapshot slightly OLDER than the files degrades to "files
# Nextcloud has not indexed yet" and is repaired with `occ files:scan`. A DB
# snapshot NEWER than the files references blobs that never made it into the
# backup, which surfaces as broken shares and dead file entries on restore.
# the app has not indexed yet" and is repaired with a rescan. A DB snapshot
# NEWER than the files references blobs that never made it into the backup,
# which surfaces as broken shares and dead file entries on restore.
set -euo pipefail
# Tag stays "nextcloud-backup" for EVERY instance, Gitea included: an external
# Graylog rule matches status=failed on this tag, and renaming it here would
# silently stop alerting for all of them. Misnomer retained deliberately.
TAG=nextcloud-backup
INSTANCE={{ backup_name }}
STAGE={{ backup_stage_path | default('/var/backups/nextcloud/' ~ backup_name) }}
@@ -26,9 +29,10 @@ log "status=start"
{% if db_container | default('') %}
# ------------------------------------------------------------ 1. database
# The Nextcloud containers are ROOTLESS podman owned by "{{ podman_user }}",
# but this script runs as root under systemd. Every podman call therefore
# goes through sudo:
# The containers are ROOTLESS podman owned by
# "{{ backup_podman_user | default(podman_user) }}" -- Nextcloud runs under
# {{ podman_user }}, Gitea under its own git user -- but this script runs as
# root under systemd. Every podman call therefore goes through sudo:
# -H HOME becomes the podman user's home, so podman finds its rootless
# graph root under ~/.local/share/containers
# cd; required preamble (see CLAUDE.md) so the shell starts in that home
@@ -37,9 +41,12 @@ log "status=start"
# guarded anyway so podman falls back cleanly if it ever does not.
#
# No credential is stored in this file or placed on a host command line:
# $MYSQL_ROOT_PASSWORD and $MYSQL_DATABASE are expanded by the shell INSIDE
# the database container, which already carries them in its environment.
# $MYSQL_ROOT_PASSWORD / $MYSQL_DATABASE (or $POSTGRES_* for postgres) are
# expanded by the shell INSIDE the database container, which already carries
# them in its environment.
{% if backup_db_type | default('mariadb') != 'postgres' %}
#
# MariaDB-specific history, for the flag set below:
# --routines and --events initially aborted the dump here: mysql.proc read as
# corrupted (error 1728) and the event scheduler reported disabled (1577),
# both artefacts of an image bump without mariadb-upgrade. `mariadb-upgrade
@@ -51,8 +58,14 @@ log "status=start"
# by daemon rather than mysql, so mysqld may not create new top-level
# databases. `sys` is purely diagnostic and unused by Nextcloud, so this is
# cosmetic -- but it does mean creating a NEW database would fail too.
{% else %}
#
# --clean --if-exists makes the dump replayable into an existing database
# (`psql -U gitea gitea < dump.sql`) rather than only into an empty one, and
# --no-owner keeps it restorable when the target role names differ.
{% endif %}
pexec() {
sudo -H -u {{ podman_user }} bash -c \
sudo -H -u {{ backup_podman_user | default(podman_user) }} bash -c \
'cd; d=/run/user/$(id -u); [ -d "$d" ] && export XDG_RUNTIME_DIR="$d"
exec podman "$@"' _ "$@"
}
@@ -63,21 +76,40 @@ rm -f "$tmp"
log "dumping {{ db_container }}"
set +e
{% if backup_db_type | default('mariadb') == 'postgres' %}
pexec exec {{ db_container }} sh -c '
exec env PGPASSWORD="$POSTGRES_PASSWORD" pg_dump -U "$POSTGRES_USER" \
--no-owner --clean --if-exists "$POSTGRES_DB"
' | gzip -6 > "$tmp"
{% elif backup_db_type | default('mariadb') == 'mysql' %}
{# Upstream mysql:5.7 ships mysqldump, NOT the mariadb-dump alias that only
appears in MariaDB 10.5+. Flags and completion trailer are identical to the
MariaDB branch; 5.7.21 was verified to accept --no-tablespaces. #}
pexec exec {{ db_container }} sh -c '
exec env MYSQL_PWD="$MYSQL_ROOT_PASSWORD" mysqldump -u root \
--single-transaction --quick --routines --events --triggers \
--no-tablespaces --default-character-set=utf8mb4 "$MYSQL_DATABASE"
' | gzip -6 > "$tmp"
{% else %}
pexec exec {{ db_container }} sh -c '
exec env MYSQL_PWD="$MYSQL_ROOT_PASSWORD" mariadb-dump -u root \
--single-transaction --quick --routines --events --triggers \
--no-tablespaces --default-character-set=utf8mb4 "$MYSQL_DATABASE"
' | gzip -6 > "$tmp"
{% endif %}
dump_rc=${PIPESTATUS[0]}
set -e
[ "$dump_rc" -eq 0 ] || fail "mariadb-dump {{ db_container }} exited $dump_rc"
[ "$dump_rc" -eq 0 ] || fail "{% if backup_db_type | default('mariadb') == 'postgres' %}pg_dump{% elif backup_db_type | default('mariadb') == 'mysql' %}mysqldump{% else %}mariadb-dump{% endif %} {{ db_container }} exited $dump_rc"
# A new dump is promoted over yesterday's only after it proves complete:
# a valid gzip stream AND the "-- Dump completed" trailer that mariadb-dump
# writes only on a clean finish. `mv` is atomic within the staging
# filesystem, so a failed or truncated run can never replace a good dump.
# A new dump is promoted over yesterday's only after it proves complete: a
# valid gzip stream AND the trailer the dump tool writes only on a clean
# finish. The two engines word it differently, so the string is per-type --
# grepping for the MariaDB one against a pg_dump would fail every run.
# `mv` is atomic within the staging filesystem, so a failed or truncated run
# can never replace a good dump.
gzip -t "$tmp" || fail "dump is not a valid gzip stream"
gunzip -c "$tmp" | tail -c 512 | grep -q 'Dump completed' \
gunzip -c "$tmp" | tail -c 512 \
| grep -q '{{ "PostgreSQL database dump complete" if backup_db_type | default("mariadb") == "postgres" else "Dump completed" }}' \
|| fail "dump is truncated (no completion trailer)"
mv -f "$tmp" "$DUMP"
log "db_dump=ok bytes=$(stat -c %s "$DUMP")"
@@ -87,6 +119,32 @@ log "db_dump=ok bytes=$(stat -c %s "$DUMP")"
# periodic ZFS snapshots (see roles/podman/README.md).
ls -1t "$STAGE"/db/"$INSTANCE"-*.sql.gz | tail -n +$((KEEP + 1)) | xargs -r rm -f
{% endif %}
{% if backup_sqlite_dbs | default([]) %}
# ----------------------------------------------------- 1b. sqlite snapshots
# These databases are WAL-mode SQLite written by a LIVE process, so neither
# rsync option is correct: skipping the -wal loses committed transactions,
# and copying .db + -wal together can catch a checkpoint mid-write. Only
# `.backup` takes a consistent snapshot of a database that is being written.
#
# Run on the HOST, not in the container: the files live on the host
# filesystem and sqlite3 is installed there, so this needs no podman at all
# and works even when the owning container is stopped.
install -d -m 0700 "$STAGE" "$STAGE/db"
{% for db in backup_sqlite_dbs %}
sqlite_out="$STAGE/db/{{ db | basename | regex_replace('\\.db$', '') }}.sqlite"
if [ ! -f "{{ db }}" ]; then
fail "sqlite source missing: {{ db }}"
fi
sqlite3 "{{ db }}" ".backup '$sqlite_out.tmp'" \
|| fail "sqlite3 .backup failed for {{ db }}"
# Prove the snapshot is a loadable database before it replaces yesterday's,
# mirroring the gzip/trailer gate the SQL dumps get above.
sqlite3 "$sqlite_out.tmp" 'pragma integrity_check;' | grep -qx ok \
|| fail "sqlite snapshot failed integrity_check: {{ db }}"
mv -f "$sqlite_out.tmp" "$sqlite_out"
log "sqlite_dump=ok db={{ db | basename }} bytes=$(stat -c %s "$sqlite_out")"
{% endfor %}
{% endif %}
# ----------------------------------------------------------- 2. file tree
# --exclude .ssh is load-bearing: {{ remote_path }} IS {{ ssh_user }}'s home
@@ -108,7 +166,7 @@ log "syncing config"
rsync -az --timeout=600 --delete --mkpath {{ backup_rsync_extra_args | default('') }} \
-e "$SSH" {{ config_path }}/ "$DEST:{{ remote_path }}/_backup/config/"
{% endif %}
{% if db_container | default('') %}
{% if db_container | default('') or backup_sqlite_dbs | default([]) %}
log "syncing db dumps"
rsync -az --timeout=600 --delete --mkpath {{ backup_rsync_extra_args | default('') }} \
-e "$SSH" "$STAGE/db/" "$DEST:{{ remote_path }}/_backup/db/"