diff --git a/README.md b/README.md index 1f7415c8795caa9e1c503cf5b41498dc541c6729..6465169914d10cd6419d486e37d63b147ea01ff8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ # IML BACKUP # -Backup scripts using restic (or duplicity). +Backup scripts using Restic (or Duplicity). Runs on Linux: CentOS, Debian, Manjaro, Ubuntu. -* Free software. GNU GPL 3.0 -* Source: <https://git-repo.iml.unibe.ch/iml-open-source/iml-backup/> +📄 Source: <https://git-repo.iml.unibe.ch/iml-open-source/iml-backup/> \ +📜 License: GNU GPL 3.0 \ +📖 Docs: <https://os-docs.iml.unibe.ch/iml-backup/> + +Supported backup clients: + * Restic: <https://restic.net/> * Duplicity: <https://duplicity.gitlab.io/duplicity-web/> diff --git a/docs/_index.md b/docs/_index.md index 0ef40ef3171cb2964e40f44cba3b1f29e61ceb56..971b330bd82b5ac160edc82e915590488fca3bc6 100644 --- a/docs/_index.md +++ b/docs/_index.md @@ -1,11 +1,15 @@ # IML BACKUP # -Backup scripts using restic (or duplicity). +Backup scripts using Restic (or Duplicity). Runs on Linux: CentOS, Debian, Manjaro, Ubuntu. -* Free software. GNU GPL 3.0 -* Source: <https://git-repo.iml.unibe.ch/iml-open-source/iml-backup/> +📄 Source: <https://git-repo.iml.unibe.ch/iml-open-source/iml-backup/> \ +📜 License: GNU GPL 3.0 \ +📖 Docs: see [docs](./docs) folder or online <https://os-docs.iml.unibe.ch/iml-backup/> + +Supported backup clients: + * Restic: <https://restic.net/> * Duplicity: <https://duplicity.gitlab.io/duplicity-web/> diff --git a/docs/style.css b/docs/style.css index 317e1370c9e2ce23984b0a2213e0fb359c02c5fd..909562cb91d2a8335f4470332ef1e07bdb2ee44c 100644 --- a/docs/style.css +++ b/docs/style.css @@ -1,12 +1,12 @@ /* patch css elements of daux.io blue theme - version 2022-04-22 + version 2022-05-13 */ -/* ---------- vars ---------- */ +/* ---------- vars ---------- */ :root{ @@ -28,8 +28,8 @@ --h1: rgba(40,60,80,0.8); --h1-bottom: 1px solid rgba(40,60,80,0.1); - --h2: rgba(40,60,80,0.5); - --h3: rgba(40,60,80,0.3); + --h2: #468; + --h3: #579; } diff --git a/plugins/transfer/restic.sh b/plugins/transfer/restic.sh index 9d87c5704289157bafe139264f51e35d1a1d12aa..cb6635c483f30434ab6faa16300f8a7515ddb291 100644 --- a/plugins/transfer/restic.sh +++ b/plugins/transfer/restic.sh @@ -13,6 +13,7 @@ # 2022-02-09 ah v0.3 update pruning; more keep-params # 2022-03-07 ah v0.4 add verify in post task # 2022-05-10 ah v0.5 fix handling with nocache flag (use globally as default param - not in backup only) +# 2022-05-16 ah v0.6 added restic prune # ================================================================================ # -------------------------------------------------------------------------------- @@ -148,6 +149,7 @@ # uses global vars from ../../transfer.sh function t_backupDoPostTasks(){ + # -------------------- echo "--- UNLOCK ... just in case :-)" echo restic unlock ${ARGS_DEFAULT} color cmd @@ -155,7 +157,8 @@ color reset echo - echo "--- PRUNE" + # -------------------- + echo "--- FORGET some data" local _tag=$( _j_getvar ${STORAGEFILE} "${CFGPREFIX}tag") local _mycmd="restic forget \ @@ -184,6 +187,20 @@ t_rcCheckCleanup $_myrc echo + # -------------------- + echo "--- PRUNE" + _mycmd="restic prune ${ARGS_DEFAULT}" + echo $_mycmd + sleep 3 + color cmd + eval $_mycmd + local _myrc=$? + color reset + + t_rcCheckPrune $_myrc + echo + + # -------------------- echo "--- VERIFY" # param --read-data takes a long time. Maybe use an extra job with it. # _mycmd="time restic check ${ARGS_DEFAULT} --with-cache --read-data" @@ -377,6 +394,16 @@ } # verify backup data # param integer exitcode of command + function t_rcCheckPrune(){ + echo -n "__PRUNE__ " + case $1 in + 0) color ok; echo "OK" ;; + *) color error; echo "FAILED - returncode was $1" ;; + esac + color reset + } + # verify backup data + # param integer exitcode of command function t_rcCheckVerify(){ echo -n "__VERIFY__ " case $1 in