From 35c19eb280d480b5f0aeed7169b10f1485df25cb Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 9 Dec 2021 09:40:23 +0100
Subject: [PATCH] Bump to Yunohost 4.3.0 (https domain-wide)

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

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 9d3be7d..79a00f3 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;
-  }
-
   # FIXME: Needed ?
   more_clear_input_headers 'Accept-Encoding';
 
diff --git a/manifest.json b/manifest.json
index 9d7dbff..2bdf6f9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,7 +22,7 @@
         "email": "felix@piedallu.me"
     },
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -45,8 +45,8 @@
                 "type": "boolean",
                 "default": true,
                 "help": {
-                    "en": "Should the app be accessible to users not logged into Yunohost",
-                    "fr": "L'app devrait-elle être accessible aux utilisateurs Yunohost"
+                    "en": "If enabled, Cinny will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+                    "fr": "Si cette case est cochée, Cinny sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
                 }
             }
         ]
diff --git a/scripts/restore b/scripts/restore
index fc10998..2ef9d5d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -33,8 +33,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 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