From cf463f2c25a6a21265f52015eba68ba5639dd5c6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Nov 2021 21:57:31 +0100 Subject: [PATCH] Fix --- conf/init-mysql.sql | 2 +- scripts/install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init-mysql.sql b/conf/init-mysql.sql index 5fd696a..87b2384 100644 --- a/conf/init-mysql.sql +++ b/conf/init-mysql.sql @@ -8,4 +8,4 @@ INSERT INTO `settings` (`id`, `name`, `value`) VALUES INSERT INTO `users` (`id`, `username`, `password`, `email`, `api_key`, `active`, `level`) VALUES -(1, '__USER__', '__PASSWORD_HASH__', '__EMAIL__', '', 1, 1); +(1, '__ADMIN__', '__PASSWORD_HASH__', '__EMAIL__', '', 1, 1); diff --git a/scripts/install b/scripts/install index fa66643..d8f73ff 100644 --- a/scripts/install +++ b/scripts/install @@ -137,14 +137,14 @@ exec_artisan "cachet:install" # Populate MySQL database sql_conf="../conf/init-mysql.sql" ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain$path_url" --target_file="$sql_conf" -ynh_replace_string --match_string="__USER__" --replace_string="$admin" --target_file="$sql_conf" +ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$sql_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$sql_conf" password_hash="$(cd $final_path ; php$YNH_PHP_VERSION artisan tinker -q --no-ansi <<< "echo Hash::make('$admin_password');" |head -n 1)" password_pash="${password_hash::-1}" # Remove last character ynh_replace_string --match_string="__PASSWORD_HASH__" --replace_string="$password_pash" --target_file="$sql_conf" -ynh_replace_string --match_string="__EMAIL__" --replace_string="$admin_mail" --target_file="$sql_conf" +ynh_replace_string --match_string="__EMAIL__" --replace_string="$email" --target_file="$sql_conf" ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \ < "$sql_conf"