From 68174b3f32c3b31940da0e84ad447adbc12c7dc1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 29 Jan 2021 12:04:15 +0100 Subject: [PATCH] Fix --- conf/nginx.conf | 11 +++++------ manifest.json | 4 ++-- scripts/install | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index b346212..1ca4c76 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,10 +10,9 @@ location __PATH__/ { } index index.php; - #try_files $uri $uri/ @bookstack; - - try_files $uri $uri/ /index.php?$query_string; + try_files $uri $uri/ @bookstack; + #try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; @@ -28,6 +27,6 @@ location __PATH__/ { include conf.d/yunohost_panel.conf.inc; } -#location @bookstack { -# rewrite ^__PATH__/(.*)$ __PATH__/index.php?/$1 last; -#} +location @bookstack { + rewrite ^__PATH__/(.*)$ __PATH__/index.php?/$1 last; +} diff --git a/manifest.json b/manifest.json index 6d1ea0f..e53fc31 100644 --- a/manifest.json +++ b/manifest.json @@ -39,8 +39,8 @@ "en": "Choose a path for BookStack", "fr": "Choisissez un chemin pour BookStack" }, - "example": "/", - "default": "/" + "example": "/bookstack", + "default": "/bookstack" }, { "name": "language", diff --git a/scripts/install b/scripts/install index 834e304..2e12774 100644 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN -path_url="/" +path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE