From 176080a0d5ec3f5e3a3cbf95b61368837efbac6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:23:05 +0100 Subject: [PATCH] cleaning --- hooks/post_user_create | 4 +++- hooks/post_user_delete | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hooks/post_user_create b/hooks/post_user_create index 83775b9..cc96b81 100644 --- a/hooks/post_user_create +++ b/hooks/post_user_create @@ -2,6 +2,8 @@ app="__APP__" user="__APP__" +install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) # Retrieve arguments username=$1 @@ -14,6 +16,6 @@ source /usr/share/yunohost/helpers user_pass=$(ynh_string_random) # Create the new user in Wallabag -(cd "/var/www/$app" && \ +(cd "$install_dir" && \ sudo -u "$user" php${phpversion} "bin/console" --no-interaction --env=prod \ fos:user:create "$username" "$user_email" "$user_pass") diff --git a/hooks/post_user_delete b/hooks/post_user_delete index 76d986c..b0cd5cf 100644 --- a/hooks/post_user_delete +++ b/hooks/post_user_delete @@ -2,12 +2,14 @@ app="__APP__" user="__APP__" +install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) # Retrieve arguments username=$1 purge=$2 # Deactivate the user from Wallabg -(cd "/var/www/$app" && \ +(cd "$install_dir" && \ sudo -u "$user" php${phpversion} "bin/console" --no-interaction --env=prod \ fos:user:deactivate "$username")