consors-report.py: updates

[bin.git] / backup

diff --git a/backup b/backup
index 1fa71c3ff083242efdcb914bec144110abacc0ff..f1bef09ac625c834ffd3e2ba3417fdbbd47fd000 100755 (executable)
--- a/backup
+++ b/backup
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 cd $HOME
-LOG=.cache/duplicity/log
+LOG=.cache/backup/log
 PATH=$PATH:/sbin:/usr/sbin
 RESTIC="restic --password-file $HOME/.config/backup-passphrase --repo sftp:piware.de:backup/restic"
 
@@ -33,16 +33,17 @@ fi
 
 notify-send "Backup started"
 mkdir -p $(dirname $LOG)
-env PASSPHRASE="$(cat ~/.config/backup-passphrase)" duplicity --allow-source-mismatch --full-if-older-than 1M --exclude-filelist ~/.config/backup-ignore . rsync://piware.de/backup/laptop >> $LOG || fail
-duplicity remove-all-but-n-full 6 --force rsync://piware.de/backup/laptop
 
-$RESTIC backup --exclude-file=$HOME/.config/backup-ignore $HOME || fail
+$RESTIC backup --exclude-file=$HOME/.config/backup-ignore $HOME >> $LOG 2>&1 || fail
 # TODO: forget --prune policy: https://restic.readthedocs.io/en/stable/060_forget.html
 notify-send "Backup finished successfully"
 
 scp .config/backup-passphrase piware.de:.cache/
 ssh piware.de chmod u+w .cache/backup-passphrase
 trap "ssh piware.de shred -u .cache/backup-passphrase" EXIT INT QUIT PIPE
-ssh piware.de restic --password-file .cache/backup-passphrase --repo backup/restic check || fail "BACKUP CHECK FAILED!"
 
+ssh piware.de restic --password-file .cache/backup-passphrase --repo backup/restic forget --prune --keep-within-hourly 24h --keep-within-daily 7d --keep-within-weekly 30d --keep-within-monthly 12m
+notify-send "Backup pruned successfully"
+
+ssh piware.de restic --password-file .cache/backup-passphrase --repo backup/restic check || fail "BACKUP CHECK FAILED!"
 notify-send "Backup checked successfully"