From 294203af56a5ca63335d2502edde88fe66d55638 Mon Sep 17 00:00:00 2001 From: Thomas Phillips Date: Wed, 29 Dec 2021 23:33:51 +0530 Subject: [PATCH] changes --- manifest.json | 10 +++++++++- scripts/install | 13 ++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index 99d0000..ea41f6f 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,15 @@ "type": "domain" }, { - "name": "admin", + "name": "username", + "type": "user" + }, + { + "name": "email", + "type": "user" + }, + { + "name": "password", "type": "user" }, { diff --git a/scripts/install b/scripts/install index 7aace21..e113b9e 100644 --- a/scripts/install +++ b/scripts/install @@ -28,11 +28,9 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -admin=$YNH_APP_ARG_ADMIN -# email=$YNH_APP_ARG_EMAIL -# password=$YNH_APP_ARG_PASSWORD - -ynh_script_progression --message="testing.... $admin" --weight=1 +username=$YNH_APP_ARG_USERNAME +email=$YNH_APP_ARG_EMAIL +password=$YNH_APP_ARG_PASSWORD ### If it's a multi-instance app, meaning it can be installed several times independently ### The id of the app as stated in the manifest is available as $YNH_APP_ID @@ -261,13 +259,10 @@ pushd "$final_path" popd ynh_script_progression --message="Create initial admin user..." -# ynh_script_progression --message=$admin -# ynh_script_progression --message=$email -# ynh_script_progression --message=$password pushd "$final_path" rake_exec="sudo -u $app $ynh_ruby_load_path RAILS_ENV=production bin/rake" - ynh_exec_warn_less $rake_exec "admin:create[thomas, thomas@yopmail.com, password]" + ynh_exec_warn_less $rake_exec "admin:create[$username, $email, $password]" popd #=================================================