From f74c16ef7cd6a76a1167edec9b5c02b69acc073c Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Tue, 10 Nov 2026 09:20:54 +0100 Subject: [PATCH] Ajout du backup Gitea (raspitipi / runtipi) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - services/gitea.sh : dump PostgreSQL + /data du conteneur + app.env - lib/common.sh : helpers ssh_pg_dump et pull_dir_sudo - README : service gitea, procédure de restauration Co-Authored-By: Claude Opus 5.5 --- README.md | 21 ++++++++++++++++++++- lib/common.sh | 20 ++++++++++++++++++++ services/gitea.sh | 17 +++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 services/gitea.sh diff --git a/README.md b/README.md index b3c5d89..5538618 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Script lancé depuis ce PC : il se connecte en SSH à chaque serveur, prend un s |---------|----------|-----------------------------------------| | lisette | raspiweb | `lisette.db` (SQLite) + `.env` | | bermite | raspiweb | `bermite.db` (SQLite) + `.env` | +| gitea | raspitipi | dump PostgreSQL `gitea.sql` + `/data` du conteneur (dépôts, LFS, `app.ini`, avatars, pièces jointes, clés SSH) + `app.env` runtipi. Exclus car regénérables : sessions, queues, indexers, tmp, log, repo-archive | ## Installation (une fois) @@ -54,6 +55,23 @@ ssh raspiweb sudo systemctl start lisette rm -rf /tmp/restore ``` +### Restaurer Gitea (raspitipi / runtipi) + +```sh +restic restore latest --tag gitea --target /tmp/rg +D=/home/pi/runtipi/app-data/migrated/gitea +ssh raspitipi sudo docker stop gitea_migrated-gitea-1 +rsync -a --rsync-path="sudo rsync" /tmp/rg/data/ raspitipi:$D/data/gitea/ +ssh raspitipi "sudo chown -R 1000:1000 $D/data/gitea/git $D/data/gitea/gitea && sudo chown -R root:root $D/data/gitea/ssh" +# base : repartir d'une base vide puis rejouer le dump +ssh raspitipi 'sudo docker exec gitea_migrated-gitea-db-1 psql -U gitea -d postgres -c "DROP DATABASE gitea" -c "CREATE DATABASE gitea OWNER gitea"' +ssh raspitipi 'sudo docker exec -i gitea_migrated-gitea-db-1 psql -U gitea -d gitea' < /tmp/rg/gitea.sql +ssh raspitipi sudo docker start gitea_migrated-gitea-1 +rm -rf /tmp/rg +``` + +Le `DROP DATABASE` ne passe que si Gitea est arrêté, faute de quoi des connexions restent ouvertes. Au premier démarrage, Gitea reconstruit les index. + ## Ajouter un service Créer `services/.sh` : @@ -64,7 +82,8 @@ SERVICE_HOST=monserveur # alias ~/.ssh/config backup_service() { # $1 = dossier de staging ssh_sqlite_snapshot "$SERVICE_HOST" /chemin/app.db "$1/app.db" pull_files "$SERVICE_HOST" "$1" /chemin/.env /chemin/uploads - # ou un dump : ssh "$SERVICE_HOST" pg_dump ... > "$1/db.sql" + # PostgreSQL en conteneur : ssh_pg_dump "$SERVICE_HOST" "$1/db.sql" + # Fichiers root/docker : pull_dir_sudo "$SERVICE_HOST" /chemin "$1/data" --exclude=/cache } ``` diff --git a/lib/common.sh b/lib/common.sh index 35d126f..cbad572 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -38,6 +38,26 @@ pull_files() { rsync -a --protect-args "${srcs[@]}" "$dest/" } +# ssh_pg_dump +# Dump SQL texte (non compressé : restic compresse et déduplique mieux). +ssh_pg_dump() { + local host=$1 ctr=$2 user=$3 db=$4 dst=$5 + log "pg_dump $host:$ctr/$db" + ssh -o BatchMode=yes "$host" \ + "sudo docker exec $(printf '%q' "$ctr") pg_dump -U $(printf '%q' "$user") $(printf '%q' "$db")" > "$dst" + tail -n 5 "$dst" | grep -q 'PostgreSQL database dump complete' \ + || die "dump PostgreSQL incomplet : $dst" +} + +# pull_dir_sudo [options rsync, ex. --exclude=x]... +# rsync lancé en root côté serveur (fichiers appartenant à root/uid docker). +pull_dir_sudo() { + local host=$1 src=$2 dest=$3; shift 3 + log "rsync (sudo) $host:$src" + mkdir -p "$dest" + rsync -a --protect-args --rsync-path="sudo rsync" "$@" "$host:${src%/}/" "$dest/" +} + # restic_store restic_store() { local service=$1 host=$2 dir=$3 diff --git a/services/gitea.sh b/services/gitea.sh new file mode 100644 index 0000000..c1c83b7 --- /dev/null +++ b/services/gitea.sh @@ -0,0 +1,17 @@ +# Gitea — app runtipi sur raspitipi (gitea + postgres:14 en conteneurs) +SERVICE_HOST=raspitipi +APP_DIR=/home/pi/runtipi/app-data/migrated/gitea +DB_CONTAINER=gitea_migrated-gitea-db-1 + +backup_service() { # $1 = dossier de staging + # Base d'abord : les dépôts copiés ensuite sont au moins aussi récents que la base. + ssh_pg_dump "$SERVICE_HOST" "$DB_CONTAINER" gitea gitea "$1/gitea.sql" + + # /data du conteneur : dépôts, LFS, app.ini, avatars, pièces jointes, clés SSH… + # On exclut ce qui est regénérable ou volatile. + pull_dir_sudo "$SERVICE_HOST" "$APP_DIR/data/gitea" "$1/data" \ + --exclude=/gitea/sessions --exclude=/gitea/queues --exclude=/gitea/indexers \ + --exclude=/gitea/tmp --exclude=/gitea/log --exclude=/gitea/repo-archive + + pull_files "$SERVICE_HOST" "$1" "$APP_DIR/app.env" +}