From 31e8a13c1953d52edb6ff7c29ad409383756a303 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 22 Nov 2021 13:10:22 +0100
Subject: [PATCH] 4.3

---
 conf/app.src    |  1 -
 conf/nginx.conf |  5 -----
 manifest.json   |  2 +-
 scripts/upgrade | 28 ++++++++++++++--------------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 947619c..b0f2fe7 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -3,4 +3,3 @@ SOURCE_SUM=50e66895cbbda095e02a8a7375ca51c0eb589956f68a223a8217d0f4c1fe1fa6
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
\ No newline at end of file
diff --git a/conf/nginx.conf b/conf/nginx.conf
index a76a980..486e582 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -3,11 +3,6 @@ location __PATH__/ {
 
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.html index.php;
 
   try_files $uri $uri/ index.php;
diff --git a/manifest.json b/manifest.json
index d663c6c..d5d6b6a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,7 @@
         "name": "chtixof"
     },
      "requirements": {
-        "yunohost": ">> 4.2.4"
+        "yunohost": ">> 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/upgrade b/scripts/upgrade
index 50a512e..9753cfa 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,6 +26,20 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 upgrade_type=$(ynh_check_app_version_changed)
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up Minchat before upgrading..." --weight=5
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -44,20 +58,6 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up Minchat before upgrading..." --weight=5
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================