From dbd135057c79584755bd43f21df02ba2120192dc Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 4 Jan 2022 22:43:31 +0100
Subject: [PATCH] Upgrade to 4.3

---
 conf/nginx.conf | 5 -----
 manifest.json   | 2 +-
 scripts/restore | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 1ffdffd..800bead 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;
-  }
-
   index index.php index.html index.htm;
 
   client_max_body_size 100M;
diff --git a/manifest.json b/manifest.json
index ef5ec63..5acb767 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/restore b/scripts/restore
index d8ed784..bdcde35 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -32,8 +32,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