diff options
| -rw-r--r-- | scripts/install | 4 | ||||
| -rw-r--r-- | scripts/remove | 2 | ||||
| -rw-r--r-- | scripts/restore | 2 | ||||
| -rw-r--r-- | scripts/upgrade | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/install b/scripts/install index dd00359..7d21d45 100644 --- a/scripts/install +++ b/scripts/install @@ -85,8 +85,8 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st ynh_script_progression --message="Creating a PostgreSQL database..." # Create PostgreSQL database -db_name="${app}_production" -db_user=$app +db_name=$(ynh_sanitize_dbid --db_name="${app}_production") +db_user=$(ynh_sanitize_dbid --db_name=$app) 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_pwd --value=$db_pwd diff --git a/scripts/remove b/scripts/remove index 0c71d04..6b16380 100644 --- a/scripts/remove +++ b/scripts/remove @@ -20,7 +20,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$app +db_user=$(ynh_sanitize_dbid --db_name=$app) final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= diff --git a/scripts/restore b/scripts/restore index e51126f..6744ddb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -33,7 +33,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$app +db_user=$(ynh_sanitize_dbid --db_name=$app) db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 34db7f3..bbbe50b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) - +db_user=$(ynh_sanitize_dbid --db_name=$app) db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) admin_mail=$(ynh_user_get_info --username=$admin --key='mail') port_web=$(ynh_app_setting_get --app=$app --key=port_web) |