From a090696fa808100af8617d878ec02b3c6ae628aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 26 Jun 2022 11:12:56 +0200
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 94edea0..d6ecfed 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -91,10 +91,10 @@ if [ -z "$db_name" ]; then
    ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 fi
 
-if [ -z "$db_pwd" ]; then
-   db_pwd=$(ynh_string_random --length=24)
-   ynh_app_setting_set --app=$app --key=psqlpwd --value=$db_pwd
-fi
+# if [ -z "$db_pwd" ]; then
+#    db_pwd=$(ynh_string_random --length=24)
+#    ynh_app_setting_set --app=$app --key=psqlpwd --value=$db_pwd
+# fi
 
 # If final_path doesn't exist, create it
 if [ -z "$data_path" ]; then
@@ -185,10 +185,13 @@ if mysqlshow | grep -q "^| $db_name "; then
 
   ynh_script_progression --message="Creating a PostgreSQL database..." --weight=10
 
+  postgres_db_pwd=$(ynh_string_random --length=24)
+  ynh_app_setting_set --app=$app --key=psqlpwd --value=$postgres_db_pwd
+
   ynh_psql_test_if_first_run
-  ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+  ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$postgres_db_pwd
   # Migrating from MySQL to PostgreSQL
-  pgloader mysql://$db_user:$mysql_db_pwd@localhost:3306/$db_name postgresql://$db_user:$db_pwd@localhost:5432/$db_name
+  pgloader mysql://$db_user:$mysql_db_pwd@localhost:3306/$db_name postgresql://$db_user:$postgres_db_pwd@localhost:5432/$db_name
   # Removinging MySQL database
   ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 else