From 325198c4b244578dbab2de8a51b8c877e09dfeb9 Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 25 Apr 2021 19:21:10 +0200 Subject: [PATCH 1/2] [fix] Backup script with local repo --- check_process | 24 ++++++++++++++++++++++-- scripts/backup | 14 +++++++------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/check_process b/check_process index 5fa3e9b..1e7a4b2 100644 --- a/check_process +++ b/check_process @@ -1,4 +1,4 @@ -;; Test complet +;; Test remote directory ; Manifest repository="ssh://sam@domain.tld:22/~/backup" passphrase="APassphrase" @@ -19,9 +19,29 @@ multi_instance=1 port_already_use=0 change_url=0 +;; Test local directory + ; Manifest + repository="/mnt/backup" + passphrase="APassphrase" + conf=1 + data=1 + apps="all" + on_calendar="Daily" + ; Checks + pkg_linter=1 + setup_sub_dir=0 + setup_root=0 + setup_nourl=1 + setup_private=0 + setup_public=0 + upgrade=1 + backup_restore=1 + multi_instance=1 + port_already_use=0 + change_url=0 ;;; Options Email=ljf+borg_ynh@reflexlibre.net -Notificatio +Notification=change ;;; Upgrade options ; commit=c1524dd8e37cc671c01f5b5363901dd6a01e6fc1 name=Merge pull request #63 from YunoHost-Apps/testing diff --git a/scripts/backup b/scripts/backup index 61e6920..7b3d35e 100755 --- a/scripts/backup +++ b/scripts/backup @@ -27,13 +27,13 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_print_info --message="Declaring files to be backed up..." -ynh_backup "/usr/local/bin/backup-with-$app" -ynh_backup "/etc/sudoers.d/$app" -ynh_backup "/etc/systemd/system/$app.service" -ynh_backup "/etc/systemd/system/$app.timer" -ynh_backup "/etc/yunohost/hooks.d/backup_method/05-${app}_app" -ynh_backup "/root/.ssh/id_${app}_ed25519" -ynh_backup "/root/.ssh/id_${app}_ed25519.pub" +ynh_backup --src_path="/usr/local/bin/backup-with-$app" +ynh_backup --src_path="/etc/sudoers.d/$app" +ynh_backup --src_path="/etc/systemd/system/$app.service" +ynh_backup --src_path="/etc/systemd/system/$app.timer" +ynh_backup --src_path="/etc/yunohost/hooks.d/backup_method/05-${app}_app" +ynh_backup --src_path="/root/.ssh/id_${app}_ed25519" --not_mandatory +ynh_backup --src_path="/root/.ssh/id_${app}_ed25519.pub" --not_mandatory #================================================= # END OF SCRIPT From 53c4e6d60fa56d423f514fbcab5d2fc95396df63 Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 25 Apr 2021 19:51:07 +0200 Subject: [PATCH 2/2] New version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6ede00a..1379553 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Backup your server on a host server using Borg.", "fr": "Sauvegardez votre serveur sur un serveur distant avec Borg." }, - "version": "1.1.16~ynh19", + "version": "1.1.16~ynh20", "url": "https://borgbackup.readthedocs.io", "license": "BSD-3-Clause", "maintainer": {