From 03d03da775340afe0a994433999bdc3e1bcb211d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jan 2021 23:09:57 +0100 Subject: [PATCH] Update remove --- scripts/remove | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/remove b/scripts/remove index 525a953..2bcbcf3 100755 --- a/scripts/remove +++ b/scripts/remove @@ -15,17 +15,15 @@ source /usr/share/yunohost/helpers app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -db_name=$(ynh_app_setting_get $app db_name) -db_user=${db_user:-"mmuser"} +domain=$(ynh_app_setting_get --app=$app --key=domain) +port=$(ynh_app_setting_get --app=$app --key=port) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) -data_path="/home/yunohost.app/$app" -logs_path="/var/log/$app" #================================================= # STANDARD REMOVE #================================================= -#================================================= # REMOVE SERVICE FROM ADMIN PANEL #================================================= @@ -68,7 +66,7 @@ ynh_script_progression --message="Removing $app main directory..." --weight=6 # Remove the app directory securely ynh_secure_remove --file="$final_path" -ynh_secure_remove --file="$data_path" +ynh_secure_remove --file="/home/yunohost.app/$app" #================================================= # REMOVE NGINX CONFIGURATION @@ -82,7 +80,7 @@ ynh_remove_nginx_config # REMOVE LOG FILE #================================================= -ynh_secure_remove --file="$logs_path" +ynh_secure_remove --file="/var/log/$app" #================================================= # REMOVE DEDICATED USER