From 4d1320fed8294105a53ac4ceb718d6fadbe2c90e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 12 Dec 2021 18:58:42 +0100
Subject: [PATCH 1/3] 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 145d1fb..6e67488 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;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
diff --git a/manifest.json b/manifest.json
index 790915a..b1b581b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,7 +21,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/restore b/scripts/restore
index 57eecd5..f4a076a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -36,8 +36,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

From 1b31ecd29b8ca4b70676d6d9e544cde4a238a5b2 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 12 Dec 2021 22:14:33 +0100
Subject: [PATCH 2/3] Update manifest.json

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

diff --git a/manifest.json b/manifest.json
index b1b581b..5b1a773 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Forum software",
         "fr": "Forum open source et libre"
     },
-    "version": "1.8.29~ynh1",
+    "version": "1.8.29~ynh2",
     "url": "https://mybb.com/",
     "upstream": {
         "license": "LGPL-3.0-only",

From 5c8fd768bfd15846d5a9a1a11bba9a1d9ee58d4c Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sun, 12 Dec 2021 21:14:40 +0000
Subject: [PATCH 3/3] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 427ff8a..57b5bed 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet.
 
-**Shipped version:** 1.8.29~ynh1
+**Shipped version:** 1.8.29~ynh2
 
 **Demo:** https://demomybb.tk/
 
diff --git a/README_fr.md b/README_fr.md
index 5ea9beb..64324e6 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet.
 
-**Version incluse :** 1.8.29~ynh1
+**Version incluse :** 1.8.29~ynh2
 
 **Démo :** https://demomybb.tk/