From 5964369d23c933b3986323570d63fbd427295fc5 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 31 Jan 2022 12:25:17 +0100
Subject: [PATCH] Fix

---
 config_panel.toml | 2 +-
 scripts/install   | 4 +---
 scripts/upgrade   | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index fc99957..75c3e32 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -10,7 +10,7 @@ name = "Bookstack configuration"
         ask = "General auth"
         choices = ["standard", "ldap"]
         default = "standard"
-        help = "Select an authentication methode to connect to BookStack"
+        help = "Select an authentication method to connect to BookStack."
         bind = "AUTH_METHOD:__FINALPATH__/.env"
 
     [main.php_fpm_config]
diff --git a/scripts/install b/scripts/install
index cc0edca..4d885e9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -26,8 +26,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
 phpversion=$YNH_PHP_VERSION
 password=$YNH_APP_ARG_PASSWORD
-admin=$YNH_APP_ARG_ADMIN
-email=$(ynh_user_get_info --username=$admin --key=mail)
 timezone="$(cat /etc/timezone)"
 redis_db=$(ynh_redis_get_free_db)
 mail_pwd=$(ynh_string_random --length=12)
@@ -135,7 +133,7 @@ ynh_script_progression --message="Install BookStack" --weight=5
 pushd $final_path
 	php$phpversion artisan key:generate --no-interaction --force
 	php$phpversion artisan migrate --no-interaction --force
-	#php$phpversion artisan bookstack:create-admin --email="$email" --name="$admin" --password="$password"
+	php$phpversion artisan bookstack:create-admin --email="admin@${domain}" --name="Admin" --password="$password"
 popd
 
 # Set permissions to app files
diff --git a/scripts/upgrade b/scripts/upgrade
index ea2f1a2..17d3e9b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -156,6 +156,7 @@ pushd $final_path
 	php$phpversion artisan cache:clear
 	php$phpversion artisan config:clear
  	php$phpversion artisan view:clear
+ 	php$phpversion artisan bookstack:create-admin --email="admin@${domain}" --name="Admin" --password="$password"
  	#php$phpversion artisan bookstack:create-admin --email="$email" --name="$admin" --password="$password"
 popd