1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hubzilla_ynh.git synced 2024-09-03 19:26:21 +02:00

Merge branch 'testing' into ci-auto-update-v7.8.7

This commit is contained in:
Éric Gaspar 2022-12-22 13:57:54 +01:00 committed by GitHub
commit 14808ecc53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions

View file

@ -89,6 +89,10 @@ ynh_app_setting_set --app=$app --key=db_name --value=$db_name
if [ $database = "mysql" ]; then if [ $database = "mysql" ]; then
ynh_script_progression --message="Creating a MySQL database..." --weight=1 ynh_script_progression --message="Creating a MySQL database..." --weight=1
ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name 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 \
<<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
db_type=0 db_type=0
elif [ $database = "postgresql" ]; then elif [ $database = "postgresql" ]; then
ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1

View file

@ -149,6 +149,9 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1
if [ $database = "mysql" ]; then if [ $database = "mysql" ]; then
db_type=0 db_type=0
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
# Change your databases character set and collation
ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
<<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
elif [ $database = "postgresql" ]; then elif [ $database = "postgresql" ]; then
db_type=1 db_type=1
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)