mirror of
https://github.com/YunoHost-Apps/bookstack_ynh.git
synced 2024-09-03 18:16:02 +02:00
Merge branch 'testing' of https://github.com/YunoHost-Apps/bookstack_ynh into testing
This commit is contained in:
commit
89707a65ac
2 changed files with 2 additions and 9 deletions
|
@ -33,7 +33,6 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
|||
db_user=$db_name
|
||||
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
|
||||
phpversion=$YNH_PHP_VERSION
|
||||
app_url_domain=$(ynh_app_setting_get --app=$app --key=app_url_domain)
|
||||
|
||||
#=================================================
|
||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
||||
|
@ -105,9 +104,10 @@ fi
|
|||
ynh_script_progression --message="Reconfiguring congif file.." --weight=1
|
||||
|
||||
new_app_url_domain="https://${new_domain}${new_path%/}"
|
||||
old_app_url_domain="https://${old_domain}${old_path%/}"
|
||||
|
||||
pushd $final_path
|
||||
yes | php$phpversion artisan bookstack:update-url $app_url_domain $new_app_url_domain
|
||||
yes | php$phpversion artisan bookstack:update-url $old_app_url_domain $new_app_url_domain
|
||||
popd
|
||||
|
||||
sed -i "/APP_URL=/c\APP_URL=$new_app_url_domain" $final_path/.env
|
||||
|
|
|
@ -26,7 +26,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
|
|||
phpversion=$YNH_PHP_VERSION
|
||||
redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
|
||||
mail_pwd=$(ynh_string_random --length=12)
|
||||
app_url_domain=$(ynh_app_setting_get --app=$app --key=app_url_domain)
|
||||
|
||||
#=================================================
|
||||
# CHECK VERSION
|
||||
|
@ -53,12 +52,6 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
||||
|
||||
# If app_url_domain doesn't exist, create it
|
||||
if [ -z "$app_url_domain" ]; then
|
||||
app_url_domain="https://$domain${path_url%/}"
|
||||
ynh_app_setting_set --app=$app --key=app_url_domain --value=$app_url_domain
|
||||
fi
|
||||
|
||||
# Cleaning legacy permissions
|
||||
if ynh_legacy_permissions_exists; then
|
||||
ynh_legacy_permissions_delete_all
|
||||
|
|
Loading…
Reference in a new issue