1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/vikunja_ynh.git synced 2024-09-03 18:06:26 +02:00

Merge pull request #8 from YunoHost-Apps/sub-folder

Sub folder
This commit is contained in:
Éric Gaspar 2021-08-20 12:37:27 +02:00 committed by GitHub
commit 9e27655a77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions

View file

@ -7,7 +7,7 @@
password="password" password="password"
; Checks ; Checks
pkg_linter=1 pkg_linter=1
setup_sub_dir=0 setup_sub_dir=1
setup_root=1 setup_root=1
setup_nourl=0 setup_nourl=0
setup_private=1 setup_private=1
@ -15,7 +15,7 @@
upgrade=1 upgrade=1
#upgrade=1 from_commit= #upgrade=1 from_commit=
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=1
change_url=1 change_url=1
;;; Options ;;; Options
Email= Email=

View file

@ -1,4 +1,5 @@
location / { #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ {
# Path to source # Path to source
alias __FINALPATH__/ ; alias __FINALPATH__/ ;
@ -8,7 +9,7 @@ location / {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }
try_files $uri $uri/ /; try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string;
index index.html index.htm; index index.html index.htm;
@ -16,7 +17,7 @@ location / {
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }
location ~* ^/(api|dav|\.well-known)/ { location __PATH__/(api|dav|\.well-known)/ {
proxy_pass http://127.0.0.1:__PORT__; proxy_pass http://127.0.0.1:__PORT__;
client_max_body_size 20M; client_max_body_size 20M;
} }

View file

@ -22,7 +22,7 @@
"requirements": { "requirements": {
"yunohost": ">= 4.2.4" "yunohost": ">= 4.2.4"
}, },
"multi_instance": false, "multi_instance": true,
"services": [ "services": [
"nginx" "nginx"
], ],
@ -33,6 +33,12 @@
"type": "domain", "type": "domain",
"example": "domain.org" "example": "domain.org"
}, },
{
"name": "path",
"type": "path",
"example": "/vikunja",
"default": "/vikunja"
},
{ {
"name": "is_public", "name": "is_public",
"type": "boolean", "type": "boolean",

View file

@ -21,7 +21,7 @@ ynh_abort_if_errors
#================================================= #=================================================
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url="/" path_url=$YNH_APP_ARG_PATH
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
timezone="$(cat /etc/timezone)" timezone="$(cat /etc/timezone)"
architecture=$(ynh_detect_arch) architecture=$(ynh_detect_arch)