From 34463779661b7877c1a2612d43cd00e03cb922c9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 10:04:52 +0100
Subject: [PATCH] cleaning up

---
 conf/nginx.conf    | 5 -----
 manifest.json      | 5 ++---
 scripts/_common.sh | 3 ---
 scripts/install    | 1 -
 scripts/restore    | 3 ---
 scripts/upgrade    | 1 -
 6 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 244e4cc..7003b29 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,11 +1,6 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-  # Force usage of https
-  # if ($scheme = http) {
-  #   rewrite ^ https://$server_name$request_uri? permanent;
-  # }
-
   proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_redirect    off;
   proxy_set_header  Host $host;
diff --git a/manifest.json b/manifest.json
index 0feacd2..aa89b95 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
       "url": "https://squeak.eauchat.org"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -34,8 +34,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7f50119..aeabb7d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies=""
-
 nodejs_version=14
 
 facilmap_version=3.4.0
diff --git a/scripts/install b/scripts/install
index 08201b1..c0ca828 100755
--- a/scripts/install
+++ b/scripts/install
@@ -78,7 +78,6 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 ynh_script_progression --message="Installing dependencies..." --weight=6
 
-ynh_install_app_dependencies $pkg_dependencies
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 1ed2dab..5bbfdde 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,8 +38,6 @@ db_user=$db_name
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-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 "
 
@@ -78,7 +76,6 @@ chown -R $app:www-data "$final_path"
 ynh_script_progression --message="Reinstalling dependencies..." --weight=10
 
 # Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 2e29f94..44a2d74 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -81,7 +81,6 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..." --weight=10
 
-ynh_install_app_dependencies $pkg_dependencies
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================