From e3d36cee97b66e15029e4ff04b7ff158f34b0c2a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 5 Dec 2021 12:38:04 +0100
Subject: [PATCH] update web

---
 check_process   | 8 ++++----
 conf/nginx.conf | 5 -----
 conf/web.src    | 5 ++---
 manifest.json   | 8 +++-----
 scripts/restore | 5 +----
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/check_process b/check_process
index 7ad0587..846f814 100644
--- a/check_process
+++ b/check_process
@@ -5,10 +5,10 @@
 
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/path"	(PATH)
-		admin="john"	(USER)
-		is_public=1	(PUBLIC|public=1|private=0)
+		domain="domain.tld"
+		path="/path"
+		admin="john"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 5d8827b..aade80d 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;
-  }
-
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
   client_max_body_size 100M;
 
diff --git a/conf/web.src b/conf/web.src
index ed05a07..bcb690d 100644
--- a/conf/web.src
+++ b/conf/web.src
@@ -1,7 +1,6 @@
-SOURCE_URL=https://github.com/dani-garcia/bw_web_builds/releases/download/v2.23.0/bw_web_v2.23.0.tar.gz
-SOURCE_SUM=d91e82151a72d04c86686e02ec1eced644005dfb2655adeec6dd1cea1b631dcdcb338e3e526caad14b74d50de1a3e7651e5a2bad159f168cd408f04737d25667
+SOURCE_URL=https://github.com/dani-garcia/bw_web_builds/releases/download/v2.23.0/bw_web_v2.24.1.tar.gz
+SOURCE_SUM=f883f3746d245ad15816db477af35fba626ada420103b4b7ef54f062033b80384c71aed873a7db6800f906a3dd9afd4d8a9a0677142675e7eeac0285a3a8426e
 SOURCE_SUM_PRG=sha512sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true
diff --git a/manifest.json b/manifest.json
index 52eff26..95ceadb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
         "name": "yalh76"
     },
     "requirements": {
-        "yunohost": ">= 4.2.0"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -30,8 +30,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -41,8 +40,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             },
             {
                 "name": "is_public",
diff --git a/scripts/restore b/scripts/restore
index 0154c46..4dbae76 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -36,10 +36,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-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