From 5bb2d8ccfa8ed6736d0a507d282a449708f82c02 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 6 Apr 2022 07:31:12 +0200
Subject: [PATCH] 4.3

---
 conf/nginx.conf |  5 -----
 manifest.json   | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 97e47cdc..38a05f9c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -3,11 +3,6 @@ location __PATH__/ {
 
     alias __FINALPATH__/;
 
-	# Force https
-	if ($scheme = http) {
-		rewrite ^ https://$server_name$request_uri? permanent;
-	}
-
 	if (!-e $request_filename) {
 		rewrite ^(.*)$ /index.php?q=$1;
 	}
diff --git a/manifest.json b/manifest.json
index eec8e6c3..dfb01cca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
-    "packaging_format": 1,
-    "id": "hubzilla",
     "name": "Hubzilla",
+    "id": "hubzilla",
+    "packaging_format": 1,
     "description": {
-        "en": "Decentralized publication platform and social network.",
-        "fr": "Plateforme de publication décentralisée et un réseau social."
+        "en": "Decentralized publication platform and social network",
+        "fr": "Plateforme de publication décentralisée et un réseau social"
     },
     "version": "7.2~ynh1",
     "url": "https://zotlabs.org/page/hubzilla/hubzilla-project",
@@ -24,7 +24,7 @@
         "postgresql"
     ],
     "requirements": {
-        "yunohost": ">= 4.2.0"
+        "yunohost": ">= 4.3.0"
     },
     "previous_maintainers": {
         "name": "Andrew Manning",