From 740d4637bf3a697cc2b88608e6dac75793803ec7 Mon Sep 17 00:00:00 2001 From: Pedro Correa Date: Mon, 4 May 2026 21:35:44 -0300 Subject: [PATCH] :sparkles: path of data --- backup_plan.sh | 27 ++++++++++++++++++++++----- cooklang/docker-compose.yml | 2 +- paisa/docker-compose.yml | 2 +- soft-serve/docker-compose.yml | 2 +- stump/docker-compose.yml | 2 +- vaultwarden/docker-compose.yml | 2 +- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/backup_plan.sh b/backup_plan.sh index dd19c5e..e32e9ab 100644 --- a/backup_plan.sh +++ b/backup_plan.sh @@ -8,8 +8,10 @@ set -e set -o pipefail +DIR_ROOT=/media/external-hd-backup + # Configuration -BORG_REPO=/external-hd-backup/borgbackup +BORG_REPO=$DIR_ROOT/borgbackup export BORG_PASSPHRASE=$(cat /root/.borg_passphrase) RCLONE_REMOTE="Google drive" @@ -17,8 +19,8 @@ RCLONE_DESTINATION="rasp" TIMESTAMP=$(date +%Y-%m-%d-%H%M%S) -SOFT_SERVE_DIR=/external-hd-backup/soft-serve/ -VAULTWARDEN_DIR=/external-hd-backup/vaultwarden-data/ +SOFT_SERVE_DIR=$DIR_ROOT/soft-serve/ +VAULTWARDEN_DIR=$DIR_ROOT/vaultwarden-data/ log() { echo "$(date "+%Y-%m-%d %H:%M:%S") - $1" @@ -44,8 +46,23 @@ borg create --stats --progress \ "$VAULTWARDEN_DIR" log "Borg backup created: $BORG_VAULTWARDEN_NAME" -# 3. Sync borg repository to the rclone remote -log "Step 3: Syncing repository to rclone remote..." +# 3. Prune repository +log "Step 3: Prunning to maintain 4 weekly and 6 monthly..." +borg prune \ + --list \ + --show-rc \ + --keep-weekly 4 \ + --keep-monthly 6 \ + $BORG_REPO +log "Prunning complete" + +# 4. Prune repository +log "Step 4: Compacting borg repo..." +borg compact $BORG_REPO +log "Compacting complete" + +# 5. Sync borg repository to the rclone remote +log "Step 5: Syncing repository to rclone remote..." rclone sync "$BORG_REPO" "$RCLONE_REMOTE":$RCLONE_DESTINATION --progress log "Sync complete" diff --git a/cooklang/docker-compose.yml b/cooklang/docker-compose.yml index 1c18a02..6bb2a62 100644 --- a/cooklang/docker-compose.yml +++ b/cooklang/docker-compose.yml @@ -3,7 +3,7 @@ services: build: . container_name: cooklang volumes: - - ./recipes:/recipes + - /media/external-hd-backup/cooklang/recipes:/recipes restart: unless-stopped networks: - cooklang-network diff --git a/paisa/docker-compose.yml b/paisa/docker-compose.yml index c5f8af7..f8d3862 100644 --- a/paisa/docker-compose.yml +++ b/paisa/docker-compose.yml @@ -4,7 +4,7 @@ services: container_name: paisa restart: unless-stopped volumes: - - /external-hd-backup/paisa/data/:/root/Documents/paisa/ + - /media/external-hd-backup/paisa/data/:/root/Documents/paisa/ labels: glance.name: Paisa glance.url: https://paisa.tulkdan.dev diff --git a/soft-serve/docker-compose.yml b/soft-serve/docker-compose.yml index e94726c..110b7ba 100644 --- a/soft-serve/docker-compose.yml +++ b/soft-serve/docker-compose.yml @@ -3,7 +3,7 @@ services: image: charmcli/soft-serve:latest container_name: soft-serve volumes: - - /external-hd-backup/soft-serve/data:/soft-serve + - /media/external-hd-backup/soft-serve/data:/soft-serve ports: - 23231:23231 - 9418:9418 diff --git a/stump/docker-compose.yml b/stump/docker-compose.yml index d3cfc2e..e9570bd 100644 --- a/stump/docker-compose.yml +++ b/stump/docker-compose.yml @@ -4,7 +4,7 @@ services: container_name: stump volumes: - /home/pedro-correa/.stump:/config - - /external-hd-backup/stump/books:/data + - /media/external-hd-backup/stump/books:/data environment: - PUID=1000 - PGID=1000 diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index a9d24a4..91386a4 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -3,7 +3,7 @@ services: image: vaultwarden/server:latest container_name: vaultwarden volumes: - - /external-hd-backup/vaultwarden-data/:/data/ + - /media/external-hd-backup/vaultwarden-data/data/:/data/ environment: DOMAIN: "https://vaultwarden.tulkdan.dev" restart: unless-stopped -- 2.51.2