From 63ce402bf8f69ced120e1904a9d64729ce495538 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Jan 2021 08:32:48 +0100 Subject: [PATCH] psql -> mysql --- scripts/install | 2 +- scripts/restore | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index d9805d2..0f961a4 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Creating a MySQL database..." --weight=10 db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name -db_pwd=$(ynh_string_random --length=24) +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_app_setting_set --app=$app --key=mysqlpwd --value=$db_pwd diff --git a/scripts/restore b/scripts/restore index b47ce9a..461f74b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,7 +29,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$(ynh_app_setting_get --app=$app --key=db_user) -db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -66,11 +65,11 @@ ynh_restore_file --origin_path="/home/yunohost.app/$app" #================================================= # RESTORE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6 +ynh_script_progression --message="Restoring the MySQL database..." --weight=6 -ynh_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd -ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RECREATE THE DEDICATED USER