mirror of
https://github.com/YunoHost-Apps/streams_ynh.git
synced 2024-09-03 20:26:20 +02:00
Clean database related code in install script
This commit is contained in:
parent
05a8ddd371
commit
4c10179be0
1 changed files with 3 additions and 21 deletions
|
@ -25,7 +25,6 @@ fpm_usage="low"
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Storing installation settings..." --weight=1
|
ynh_script_progression --message="Storing installation settings..." --weight=1
|
||||||
|
|
||||||
ynh_app_setting_set --app=$app --key=database --value=$database
|
|
||||||
ynh_app_setting_set --app=$app --key=email --value=$email
|
ynh_app_setting_set --app=$app --key=email --value=$email
|
||||||
ynh_app_setting_set --app=$app --key=upload --value=$upload
|
ynh_app_setting_set --app=$app --key=upload --value=$upload
|
||||||
ynh_app_setting_set --app=$app --key=random_string --value=$random_string
|
ynh_app_setting_set --app=$app --key=random_string --value=$random_string
|
||||||
|
@ -39,23 +38,10 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
|
||||||
|
|
||||||
ynh_script_progression --message="Creating a database..." --weight=2
|
ynh_script_progression --message="Creating a database..." --weight=2
|
||||||
|
|
||||||
db_name=$(ynh_sanitize_dbid --db_name=$app)
|
# ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
|
||||||
db_user=$db_name
|
|
||||||
db_pwd=$(ynh_string_random --length=30)
|
|
||||||
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
|
|
||||||
|
|
||||||
if [ $database == "mysql" ]; then
|
|
||||||
ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
|
|
||||||
ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
|
ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
|
||||||
<<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
|
<<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
|
||||||
db_type=0
|
|
||||||
elif [ $database == "postgresql" ]; then
|
|
||||||
ynh_psql_test_if_first_run
|
|
||||||
ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
|
|
||||||
db_type=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||||
|
@ -100,11 +86,7 @@ ynh_install_composer
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Provisionning database..." --weight=1
|
ynh_script_progression --message="Provisionning database..." --weight=1
|
||||||
|
|
||||||
if [ $database = "mysql" ]; then
|
ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_mysql.sql
|
||||||
ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_mysql.sql
|
|
||||||
elif [ $database = "postgresql" ]; then
|
|
||||||
ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_postgres.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# ADD A CONFIGURATION
|
# ADD A CONFIGURATION
|
||||||
|
|
Loading…
Add table
Reference in a new issue