diff --git a/plugins/transfer/duplicity.sh b/plugins/transfer/duplicity.sh index 262cad0a4892e5edb7696e8cd952ca467dcc919c..2b1788c16734b024aa1182ddeeea06118b93d3c7 100644 --- a/plugins/transfer/duplicity.sh +++ b/plugins/transfer/duplicity.sh @@ -174,9 +174,9 @@ fi } - # forget old data + # prune old data # uses global vars from ../../transfer.sh - function t_backupDoForget(){ + function t_backupDoPrune(){ echo "--- FORGET some data" cmd="duplicity remove-older-than $STORAGE_KEEP --force ${ARGS_DEFAULT} ${STORAGE_TARGETPATH}" echo $cmd @@ -187,11 +187,6 @@ t_rcCheckCleanup $myrc } - # prune old data - # uses global vars from ../../transfer.sh - function t_backupDoPrune(){ - echo "--- PRUNE is not implemented yet for duplicity." - } # verify backup data # uses global vars from ../../transfer.sh function t_backupDoVerify(){ diff --git a/plugins/transfer/restic.sh b/plugins/transfer/restic.sh index 3b6c73f6ba850dd663dec1f52b880b511a8b106a..7312b872ed81c017223438e0d7cfe05007a33f76 100644 --- a/plugins/transfer/restic.sh +++ b/plugins/transfer/restic.sh @@ -170,11 +170,12 @@ echo } - # forget data - # uses global vars from ../../transfer.sh - function t_backupDoForget(){ - echo "--- FORGET some data" + # prune old data + # uses global vars from ../../transfer.sh + function t_backupDoPrune(){ + # -------------------- + echo "--- FORGET (in all pathes of repository)" local _tag=$( _j_getvar ${STORAGEFILE} "${CFGPREFIX}tag") local _mycmd="restic forget \ @@ -182,7 +183,6 @@ --tag $_tag \ --group-by paths,tags \ --prune \ - --path ${BACKUP_DIR} \ --cleanup-cache" local _keep @@ -203,13 +203,9 @@ t_rcCheckCleanup $_myrc echo - } - # prune old data - # uses global vars from ../../transfer.sh - function t_backupDoPrune(){ # -------------------- - echo "--- PRUNE" + echo "--- PRUNE (whole repository)" _mycmd="restic prune ${ARGS_DEFAULT}" echo $_mycmd sleep 3 @@ -225,7 +221,7 @@ # uses global vars from ../../transfer.sh function t_backupDoVerify(){ # -------------------- - echo "--- VERIFY" + echo "--- VERIFY (whole repository)" # param --read-data takes a long time. Maybe use an extra job with it. # _mycmd="time restic check ${ARGS_DEFAULT} --with-cache --read-data" _mycmd="restic check ${ARGS_DEFAULT}" diff --git a/transfer.sh b/transfer.sh index af2efd39c8d0e399c477448ef58c6f1061291c45..cdddc3ff6a6012ed66c3e874a1fe85fc6cdd0f99 100755 --- a/transfer.sh +++ b/transfer.sh @@ -405,16 +405,6 @@ function setAction(){ touch ${lastbackupfile} fi - # --- prune - if [ $doPrune -eq 0 ]; then - echo "SKIP forget data" - else - h3 "`date` FORGET data of ${BACKUP_DIR}" - t_backupDoForget - echo - fi - echo - else color warning echo "DIR SKIP $mydir ... does not exist (no error)"