From 5eb19f5b835bd1861e165fe71dadae987ad74d1e Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 19 Nov 2018 15:49:57 +0100
Subject: [PATCH] fix

---
 conf/nginx.conf |  2 +-
 manifest.json   | 97 +++++++++++++++++++++++++++----------------------
 scripts/install | 22 +++++------
 3 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 5a74de2..e50388e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,4 @@
-location ^~ __PATH__/ {
+location / {
   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 cbb6e4c..e7a49de 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,49 +1,58 @@
 {
-  "name": "OnlyOffice",
-  "id": "onlyoffice",
-  "packaging_format": 1,
-  "description": {
-    "en": "OnlyOffice package for YunoHost.",
-    "fr": "OnlyOffice pour YunoHost."
-  },
-  "url": "https://",
-  "license": "free",
-  "maintainer": {
-    "name": "liberodark",
-    "email": "liberodark@gmail.com",
-    "url": "https://onlyoffice.com"
-  },
-  "requirements": {
-    "yunohost": ">= 2.7.2"
-  },
-  "multi_instance": false,
-  "services": [
-    "nginx",
-    "php5-fpm",
-    "mysql"
-  ],
-  "arguments": {
-    "install": [{
-      "name": "domain",
-      "type": "domain",
-      "ask": {
-        "en": "Choose a domain name for onlyoffice",
-        "fr": "Choisissez un nom de domaine pour onlyoffice"
-      },
-      "example": "example.com"
+    "name": "OnlyOffice",
+    "id": "onlyoffice",
+    "packaging_format": 1,
+    "description": {
+        "en": "OnlyOffice package for YunoHost.",
+        "fr": "OnlyOffice pour YunoHost."
     },
+    "version": "3.5.2",
+    "url": "https://www.onlyoffice.com/",
+    "license": "free",
+    "maintainer": {
+        "name": "liberodark",
+        "email": "liberodark@gmail.com"
+    },
+    "requirements": {
+        "yunohost": ">= 2.7.2"
+    },
+    "multi_instance": true,
+    "services": [
+        "nginx",
+        "php5-fpm",
+        "mysql"
+    ],
+    "arguments": {
+        "install": [{
+                "name": "domain",
+                "type": "domain",
+                "ask": {
+                    "en": "Choose a domain name for OnlyOffice",
+                    "fr": "Choisissez un nom de domaine pour OnlyOffice"
+                },
+                "example": "example.com"
+            },
 
-    {
-      "name": "path",
-      "type": "path",
-      "ask": {
-        "en": "Choose a path for OnlyOffice",
-        "fr": "Choisissez un chemin pour OnlyOffice"
-      },
-      "example": "/onlyoffice",
-      "default": "/onlyoffice"
+            {
+                "name": "path",
+                "type": "path",
+                "ask": {
+                    "en": "Choose a path for OnlyOffice /onlyoffice is accepted",
+                    "fr": "Choisissez un chemin pour OnlyOffice /onlyoffice est accepté"
+                },
+                "example": "/onlyoffice",
+                "default": "/onlyoffice"
+            },
+            
+            {
+                "name": "is_public",
+                "type": "boolean",
+                "ask": {
+                    "en": "Is it a public site ?",
+                    "fr": "Est-ce un site public ?"
+                },
+                "default": "true"
+            }
+        ]
     }
-
-  ]
-}
 }
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 64034d0..c79448c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#source _common.sh
+source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -26,8 +26,8 @@ ynh_abort_if_errors
 
 # Retrieve arguments
 domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
+#path_url=$YNH_APP_ARG_PATH
+#port=$YNH_APP_ARG_PORT
 
 ### If it's a multi-instance app, meaning it can be installed several times independently
 ### The id of the app as stated in the manifest is available as $YNH_APP_ID
@@ -51,20 +51,19 @@ final_path=/opt/yunohost/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
 # Normalize the url path syntax
-path_url=$(ynh_normalize_url_path $path_url)
+path_url=$(ynh_normalize_url_path /)
 
 # Check web path availability
-ynh_webpath_available $domain $path_url
+ynh_webpath_available $domain /
 # Register (book) web path
-ynh_webpath_register $app $domain $path_url
+ynh_webpath_register $app $domain /
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
 
 ynh_app_setting_set $app domain $domain
-ynh_app_setting_set $app path $path_url
-ynh_app_setting_set $app is_public $is_public
+#ynh_app_setting_set $app port $port
 
 #=================================================
 # FIND AND OPEN A PORT
@@ -202,11 +201,8 @@ cp -a ../conf/default.json /etc/onlyoffice/documentserver/default.json
 # SETUP SSOWAT
 #=================================================
 
-# If app is public, add url to SSOWat conf as skipped_uris
-if [ $is_public -eq 1 ]; then
-  # unprotected_uris allows SSO credentials to be passed anyway.
-  ynh_app_setting_set "$app" unprotected_uris "/"
-fi
+# unprotected_uris allows SSO credentials to be passed anyway.
+ynh_app_setting_set $app unprotected_uris "/"
 
 # Reload services
 systemctl restart nginx