From 5b0eb0971b0b521e16a6af45d8a7d9b513ff5dbc Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 4 Jan 2022 22:32:04 +0100
Subject: [PATCH] 4.3

---
 conf/app.src    |  1 -
 conf/nginx.conf |  5 -----
 manifest.json   |  9 ++++++++-
 scripts/backup  | 12 ++++++------
 scripts/restore |  3 +--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index c7bb800..345039c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -3,4 +3,3 @@ SOURCE_SUM=db949c4363b048a02eaa0f06a26a8386979b8734198c2939ee1e8cc54362ca67
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 0fa8385..6cb3320 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
 	# Path to source
 	alias __FINALPATH__/;
 
-	# Force usage of https
-	if ($scheme = http) {
-		rewrite ^ https://$server_name$request_uri? permanent;
-	}
-
 	location ^~ __PATH__/app/data {
 		deny all;
 	}
diff --git a/manifest.json b/manifest.json
index 540a6a8..67fcad4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,12 +8,19 @@
 	},
 	"version": "1.16.0~ynh1",
 	"url": "https://www.rainloop.net/",
+	"upstream": {
+        "license": "AGPL-3.0-or-later",
+        "website": "https://www.rainloop.net/",
+        "demo": "https://mail.rainloop.net/",
+        "admindoc": "https://www.rainloop.net/docs/configuration/",
+        "code": "https://github.com/RainLoop/rainloop-webmail"
+    },
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {
 		"name": "scith, Djip007, polytan02"
 	},
 	"requirements": {
-		"yunohost": ">= 4.1.7"
+		"yunohost": ">= 4.3.0"
 	},
 	"multi_instance": true,
 	"services": [
diff --git a/scripts/backup b/scripts/backup
index 99e96df..e5592ac 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -51,12 +51,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-#=================================================
-# BACKUP THE MYSQL DATABASE
-#=================================================
-
-ynh_mysql_dump_db --database="$db_name" > db.sql
-
 #=================================================
 # BACKUP FAIL2BAN CONFIGURATION
 #=================================================
@@ -72,6 +66,12 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
 
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
+#=================================================
+# BACKUP THE MYSQL DATABASE
+#=================================================
+
+ynh_mysql_dump_db --database="$db_name" > db.sql
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index f1a1bd4..3d29401 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,8 +34,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS