diff --git a/scripts/install b/scripts/install index b06b4cd..a8d9196 100755 --- a/scripts/install +++ b/scripts/install @@ -144,6 +144,13 @@ ynh_script_progression --message="Configuring PHP-FPM..." ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# CREATE A DATABASE VAR +#================================================= + +db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name + #================================================= # MODIFY A CONFIG FILE #================================================= @@ -160,8 +167,7 @@ chown $app:$app "$final_path/.htconfig.php" if [ $database -eq 1 ]; then ynh_script_progression --message="Creating a MySQL database..." - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$db_name + ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql @@ -169,8 +175,7 @@ elif [ $database -eq 2 ]; then # Create postgresql database ynh_script_progression --message="Creating a postgresql database..." ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$final_path/.htconfig.php" - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$app + ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name