From 55e5b2133029ce021f94070dafc1bbc5910de8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@plopoyop.me>
Date: Sat, 23 Feb 2019 17:45:11 +0100
Subject: [PATCH] force install on domain root and as public

---
 manifest.json   | 23 ++---------------------
 scripts/install | 15 ++-------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0d6412b..7af1863 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
     "id": "gotify",
     "packaging_format": 1,
     "description": {
-        "en": "Gotify package for YunoHost.",
-        "fr": "Package Gotify pour YunoHost."
+        "en": "A simple server for sending and receiving messages.",
+        "fr": "Un simple serveur pour envoyer et recevoir des messages."
     },
     "version": "1.2.1",
     "url": "http://gotify.net",
@@ -32,16 +32,6 @@
                 },
                 "example": "example.com"
             },
-            {
-                "name": "path",
-                "type": "path",
-                "ask": {
-                    "en": "Choose a path for gotify",
-                    "fr": "Choisissez un chemin pour gotify"
-                },
-                "example": "/gotify",
-                "default": "/gotify"
-            },
             {
                 "name": "admin",
                 "type": "user",
@@ -51,15 +41,6 @@
                 },
                 "example": "johndoe"
             },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "ask": {
-                    "en": "Is it a public application?",
-                    "fr": "Est-ce une application publique ?"
-                },
-                "default": true
-            },
             {
                 "name": "password",
                 "type": "password",
diff --git a/scripts/install b/scripts/install
index 9b70e23..aeb1859 100755
--- a/scripts/install
+++ b/scripts/install
@@ -26,9 +26,9 @@ ynh_abort_if_errors
 #=================================================
 
 domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
+path_url=/
 admin=$YNH_APP_ARG_ADMIN
-is_public=$YNH_APP_ARG_IS_PUBLIC
+is_public=1
 password=$YNH_APP_ARG_PASSWORD
 
 ### If it's a multi-instance app, meaning it can be installed several times independently
@@ -53,12 +53,6 @@ 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)
 
-# Does not work in subpath
-if [ "$path_url" != "/" ]
-then
-	ynh_die "Cannot be installed in subpath"
-fi
-
 # Check web path availability
 ynh_webpath_available $domain $path_url
 # Register (book) web path
@@ -127,11 +121,6 @@ ynh_setup_source "$final_path" $architecture
 ### `ynh_add_nginx_config` will use the file conf/nginx.conf
 
 # Create a dedicated nginx config
-if [ "$path_url" != "/" ]
-then
-	ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
-fi
-
 ynh_add_nginx_config
 
 #=================================================