From 05f10485735314986719c03f77abb1be281e0cb8 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 8 Jan 2024 19:52:46 +0100 Subject: [PATCH] rename mail and default_password to admin_mail and admin_default_password --- doc/POST_INSTALL.md | 4 ++-- doc/POST_INSTALL_fr.md | 4 ++-- scripts/install | 11 ++++++----- scripts/restore | 2 +- scripts/upgrade | 13 +++++++------ 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 52a1e54..b507e2b 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -2,7 +2,7 @@ You can access it here: <__PATH__> -Your login is: `__MAIL__` -Your password is: `__DEFAULT_PASSWORD__` +Your login is: `__ADMIN_MAIL__` +Your password is: `__ADMIN_DEFAULT_PASSWORD__` Please change this generated default password in the æneria settings. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 4db000a..9982af8 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -2,7 +2,7 @@ Vous pouvez y accéder à cette adresse : <__PATH__> -Votre identifiant : `__MAIL__` -Votre mot de passe : `__DEFAULT_PASSWORD__` +Votre identifiant : `__ADMIN_MAIL__` +Votre mot de passe : `__ADMIN_DEFAULT_PASSWORD__` Merci de changer ce mot de passe généré par défaut dans les paramètres de æneria. diff --git a/scripts/install b/scripts/install index b9b8efc..829949b 100644 --- a/scripts/install +++ b/scripts/install @@ -59,11 +59,12 @@ ynh_script_progression --message="Installing aeneria..." --weight=1 pushd "$install_dir" ynh_exec_as "$app" "php$phpversion" bin/console aeneria:install "$app" -n # Create admin user - mail=$(ynh_user_get_info --username="$admin" --key='mail') - default_password="$(ynh_string_random)" - ynh_app_setting_set --app="$app" --key=default_password --value="$default_password" - ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:add "$mail" "$default_password" -n - ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:grant "$mail" + admin_mail=$(ynh_user_get_info --username="$admin" --key='mail') + ynh_app_setting_set --app="$app" --key=admin_mail --value="$admin_mail" + admin_default_password="$(ynh_string_random)" + ynh_app_setting_set --app="$app" --key=admin_default_password --value="$admin_default_password" + ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:add "$admin_mail" "$admin_default_password" -n + ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:grant "$admin_mail" popd #================================================= diff --git a/scripts/restore b/scripts/restore index 5357cd5..034c742 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,7 +18,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" -chown -R "$app:www-data" "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE PSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index d702203..dae9ecd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,14 +95,15 @@ pushd "$install_dir" ynh_exec_as "$app" "php$phpversion" bin/console doctrine:migrations:migrate -n # Set admin user - mail=$(ynh_user_get_info --username="$admin" --key='mail') - user_exists=$(ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:exist "$mail") + admin_mail=$(ynh_user_get_info --username="$admin" --key='mail') + ynh_app_setting_set --app="$app" --key=admin_mail --value="$admin_mail" + user_exists=$(ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:exist "$admin_mail") if [ "$user_exists" -eq 0 ] then - default_password=$(ynh_string_random) - ynh_app_setting_set --app="$app" --key=default_password --value="$default_password" - ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:add "$mail" "$default_password" -n - ynh_print_info --message="An æneria user as been created. Your login: $mail Your password: $default_password" + admin_default_password=$(ynh_string_random) + ynh_app_setting_set --app="$app" --key=admin_default_password --value="$admin_default_password" + ynh_exec_as "$app" "php$phpversion" bin/console aeneria:user:add "$admin_mail" "$admin_default_password" -n + ynh_print_info --message="An æneria user as been created. Your login: $admin_mail Your password: $admin_default_password" fi # Regenerate RSA keys