1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/bookstack_ynh.git synced 2024-09-03 18:16:02 +02:00
This commit is contained in:
ericgaspar 2021-01-29 10:29:28 +01:00
parent d3f1100b5e
commit e037e4c232
No known key found for this signature in database
GPG key ID: 574F281483054D44
4 changed files with 8 additions and 3 deletions

View file

@ -18,7 +18,7 @@ APP_KEY=SomeRandomString
# If you change this in the future you may need to run a command # If you change this in the future you may need to run a command
# to update stored URLs in the database. Command example: # to update stored URLs in the database. Command example:
# php artisan bookstack:update-url https://old.example.com https://new.example.com # php artisan bookstack:update-url https://old.example.com https://new.example.com
APP_URL=https:__DOMAIN__ APP_URL=https:__DOMAIN____PATH__
# Application default language # Application default language
# The default language choice to show. # The default language choice to show.

View file

@ -9,9 +9,8 @@ location __PATH__/ {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }
try_files $uri $uri/ __PATH__/index.php?$query_string;
index index.php; index index.php;
try_files $uri $uri/ @bookstack;
#try_files $uri $uri/ index.php; #try_files $uri $uri/ index.php;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
@ -28,3 +27,7 @@ location __PATH__/ {
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }
location @bookstack {
rewrite ^__PATH__/(.*)$ __PATH__/index.php?/$1 last;
}

View file

@ -107,6 +107,7 @@ cp -a ../conf/.env.example $final_path/.env
ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env" ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env"
ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/.env" ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/.env"
ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/.env" ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/.env"
ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$final_path/.env"
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/.env" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/.env"
ynh_store_file_checksum $final_path/.env ynh_store_file_checksum $final_path/.env

View file

@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
language=$(ynh_app_setting_get --app=$app --key=language)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
#================================================= #=================================================