From 3f82757ed044173476c5b5379a4576fba60edaa3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 22 Nov 2021 23:41:27 +0100
Subject: [PATCH] 4.3

---
 check_process            | 2 --
 conf/app.src             | 1 -
 conf/nginx.conf          | 5 -----
 doc/.gitkeep             | 0
 doc/screenshots/.gitkeep | 0
 manifest.json            | 2 +-
 scripts/restore          | 3 +--
 7 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 doc/.gitkeep
 delete mode 100644 doc/screenshots/.gitkeep

diff --git a/check_process b/check_process
index 28eddda..ac78f5c 100644
--- a/check_process
+++ b/check_process
@@ -6,7 +6,6 @@
 		language="fr"
 		is_public=1
 		password="1Strong-Password"
-		port="666"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -18,7 +17,6 @@
 		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email=
diff --git a/conf/app.src b/conf/app.src
index 04d30f3..33029ec 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -3,5 +3,4 @@ SOURCE_SUM=8d4e64b47e9bdcf037e523ce909392a07fe97620ac9f30772b3b1fc1542cd07a
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index f1d5c49..b26a6dc 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/doc/.gitkeep b/doc/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/screenshots/.gitkeep b/doc/screenshots/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/manifest.json b/manifest.json
index 41c7673..4e178fb 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 0ddfb67..be19705 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -36,8 +36,7 @@ db_user=$db_name
 #=================================================
 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