From df550e3de46b0f802fa2893855e23b764d342bdd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Jan 2021 23:05:42 +0100 Subject: [PATCH] Fix --- conf/config.json | 2 +- scripts/install | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/conf/config.json b/conf/config.json index eebd33a..077fe77 100644 --- a/conf/config.json +++ b/conf/config.json @@ -144,7 +144,7 @@ }, "SqlSettings": { "DriverName": "mysql", - "DataSource": "mysql://mmuser:__DB_PASS__@tcp(127.0.0.1:3306)/__DB_NAME__?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s", + "DataSource": "mysql://__DB_USER__:__DB_PASS__@tcp(127.0.0.1:3306)/__DB_NAME__?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s", "DataSourceReplicas": [], "DataSourceSearchReplicas": [], "MaxIdleConns": 20, diff --git a/scripts/install b/scripts/install index 91469f0..9aa590e 100644 --- a/scripts/install +++ b/scripts/install @@ -13,6 +13,9 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + ynh_clean_check_starting +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -20,7 +23,6 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -app=$YNH_APP_INSTANCE_NAME domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC @@ -29,6 +31,8 @@ admin_password=$YNH_APP_ARG_ADMIN_PASSWORD language=$YNH_APP_ARG_LANGUAGE team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME +app=$YNH_APP_INSTANCE_NAME + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -66,31 +70,20 @@ ynh_app_setting_set --app=$app --key=port --value=$port # SET UP INSTALLATION VARIABLES #================================================= -root_path="$(pwd)/.." data_path="/home/yunohost.app/$app" logs_path="/var/log/$app" -#================================================= -# INSTALL DEPENDENCIES -#================================================= -#ynh_script_progression --message="Installing dependencies..." --weight=2 - -#ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE A MYSQL DATABASE #================================================= ynh_script_progression --message="Creating a MySQL database..." --weight=10 db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=mmuser -db_pwd=$(ynh_string_random --length=30) +db_user=$db_name +#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=db_user --value=$db_user -ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd - -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # CREATE DEDICATED USER @@ -125,6 +118,7 @@ cp ../conf/config.json $final_path/config/config.json ynh_replace_string --match_string="__URL__" --replace_string="https://$domain$path_url" --target_file="$final_path/config/config.json" ynh_replace_string --match_string="__PORT__" --replace_string="127.0.0.1:$port" --target_file="$final_path/config/config.json" ynh_replace_string --match_string="__DB_NAME__" --replace_string=$db_name --target_file="$final_path/config/config.json" +ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_user --target_file="$final_path/config/config.json" ynh_replace_string --match_string="__DB_PASS__" --replace_string=$db_pwd --target_file="$final_path/config/config.json" ynh_replace_string --match_string="__DATA__" --replace_string=$data_path --target_file="$final_path/config/config.json"