From 95f454751183148cfb42962b904797f8d21a0208 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 13 Jul 2020 10:47:51 +0200
Subject: [PATCH 1/6] [fix] Backup not working

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index bff45e1..8ed15a8 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.10~ynh2",
+    "version": "1.1.10~ynh3",
     "url": "https://borgbackup.readthedocs.io",
     "license": "BSD-3-Clause",
     "maintainer": {

From dc14def38ad9ad343e0639da326eda76b3279a63 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 13 Jul 2020 10:52:07 +0200
Subject: [PATCH 2/6] [fix] Sources not replaced

---
 scripts/upgrade | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8a24bbb..74aa886 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -46,3 +46,18 @@ if is_stretch; then
 
     install_borg_with_pip
 fi
+
+#=================================================
+# SETUP THE BACKUP METHOD
+#=================================================
+ynh_configure backup_method "/etc/yunohost/hooks.d/backup_method/05-${app}_app"
+
+#=================================================
+# CONFIGURE CRON
+#=================================================
+ynh_configure backup-with-borg "/usr/local/bin/backup-with-$app"
+chmod u+x "/usr/local/bin/backup-with-$app"
+ynh_add_systemd_config
+ynh_configure systemd.timer "/etc/systemd/system/$app.timer"
+systemctl enable $app.timer
+systemctl start $app.timer

From f6d026cc33f682bbb916be7b2502b1c3846d360f Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 13 Jul 2020 10:56:40 +0200
Subject: [PATCH 3/6] [fix] Template empty

---
 scripts/upgrade | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 74aa886..37bf231 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,6 +15,14 @@ source /usr/share/yunohost/helpers
 
 app=$YNH_APP_INSTANCE_NAME
 
+export server=$(ynh_app_setting_get $app server)
+export ssh_user=$(ynh_app_setting_get $app ssh_user)
+export passphrase=$(ynh_app_setting_get $app passphrase)
+export on_calendar=$(ynh_app_setting_get $app on_calendar)
+export conf=$(ynh_app_setting_get $app conf)
+export data=$(ynh_app_setting_get $app data)
+export apps=$(ynh_app_setting_get $app apps)
+
 #=================================================
 # CHECK IF AN UPGRADE IS NEEDED
 #=================================================

From 6b15d301bdfd5aaf3eea9cc015ece2a8a4d29765 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 13 Jul 2020 10:59:44 +0200
Subject: [PATCH 4/6] [fix] Update version number

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 8ed15a8..1c34bd1 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.10~ynh3",
+    "version": "1.1.10~ynh4",
     "url": "https://borgbackup.readthedocs.io",
     "license": "BSD-3-Clause",
     "maintainer": {

From 08bf69e11dc885722bbf5c8582314892bdc86f7a Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:14:45 +0200
Subject: [PATCH 5/6] [fix] Bad private key to remote connexion

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 37bf231..6ddfd53 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers
 # LOAD SETTINGS
 #=================================================
 
-app=$YNH_APP_INSTANCE_NAME
+export app=$YNH_APP_INSTANCE_NAME
 
 export server=$(ynh_app_setting_get $app server)
 export ssh_user=$(ynh_app_setting_get $app ssh_user)

From a22f384497fa3fd9c34dac6de7cc15372f99059a Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:15:16 +0200
Subject: [PATCH 6/6] [fix] Change package version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 1c34bd1..7ee5f85 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.10~ynh4",
+    "version": "1.1.10~ynh5",
     "url": "https://borgbackup.readthedocs.io",
     "license": "BSD-3-Clause",
     "maintainer": {