From 1b5539229370577be2629da9fd6b456577d51752 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 25 Nov 2021 18:45:05 +0100
Subject: [PATCH] Fix

---
 conf/nginx.conf    |  5 -----
 doc/DESCRIPTION.md |  1 +
 manifest.json      | 21 +++++++++++++--------
 scripts/restore    |  5 +----
 4 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 doc/DESCRIPTION.md

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 96f0c5f..9e0344f 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_http_version 1.1;
   proxy_buffering off;
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..d33d446
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+Cockpit is a web-based graphical interface for servers, intended for everyone.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f345bdc..e9dbce2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,29 +3,34 @@
     "id": "cockpit",
     "packaging_format": 1,
     "description": {
-        "en": "Sysadmin login session in a web browser.",
-        "fr": "Session de connexion sysadmin dans un navigateur Web."
+        "en": "Sysadmin login session in a web browser",
+        "fr": "Session de connexion sysadmin dans un navigateur Web"
     },
-    "version": "232~ynh1",
+    "version": "257~ynh1",
     "url": "https://cockpit-project.org/",
+    "upstream": {
+        "license": "LGPL-2.1-only",
+        "website": "https://cockpit-project.org/",
+        "demo": "https://demo.example.com",
+        "admindoc": "https://cockpit-project.org/documentation.html",
+        "code": "https://some.forge.com/example/example"
+    },
     "license": "LGPL-2.1-only",
     "maintainer": {
         "name": "liberodark",
         "email": "liberodark@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [
-        "nginx",
-        "mysql"
+        "nginx"
     ],
     "arguments": {
         "install": [{
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
diff --git a/scripts/restore b/scripts/restore
index 794a868..050f3f8 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,10 +34,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 #=================================================
 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 "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS