From 590ddd38bc79269b5bc070c54962dbb394dbb9cf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 21 May 2021 14:50:02 +0200 Subject: [PATCH] Revert "Fix" This reverts commit 4d128aaf6ec90eb3fd7d630c432954e2236e8b3b. --- check_process | 4 ++-- conf/nginx.conf | 5 +++-- scripts/install | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 88c0bfb..0e2363c 100644 --- a/check_process +++ b/check_process @@ -7,7 +7,7 @@ password="password" ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 @@ -15,7 +15,7 @@ upgrade=1 #upgrade=1 from_commit= backup_restore=1 - multi_instance=1 + multi_instance=0 change_url=1 ;;; Options Email= diff --git a/conf/nginx.conf b/conf/nginx.conf index 9bab126..f74bf7a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +1,12 @@ -location / { +#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_pass http://127.0.0.1:__PORT__/; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/scripts/install b/scripts/install index ff48f57..9307a3c 100644 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url="/" +path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC architecture=$(ynh_detect_arch) password=$YNH_APP_ARG_PASSWORD