From c1608aac611214c8a08b78e937501f0619cf824b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 31 Mar 2019 19:27:20 +0200
Subject: [PATCH] fix postgresql user role creation

---
 manifest.json   | 2 +-
 scripts/install | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 288286a..8b7f38e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.",
         "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown."
     },
-    "version": "2.0.0-beta.68~ynh1",
+    "version": "2.0.0-beta.68~ynh2",
     "url": "https://wiki.js.org/",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 4a2e055..dc898e3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -79,7 +79,7 @@ db_pwd=$(ynh_string_random 30)
 ynh_app_setting_set "$app" db_name "$db_name"
 ynh_app_setting_set "$app" db_pwd "$db_pwd"
 ynh_psql_test_if_first_run
-ynh_psql_create_db "$db_name" "$db_name" "$db_pwd"
+ynh_psql_setup_db "$db_name" "$db_name" "$db_pwd"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/restore b/scripts/restore
index 81e8162..c391ae4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -92,7 +92,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_print_info "Restoring the PostgreSQL database..."
 
 ynh_psql_test_if_first_run
-ynh_psql_create_db "$db_name" "$db_name" "$db_pwd"
+ynh_psql_setup_db "$db_name" "$db_name" "$db_pwd"
 ynh_psql_execute_file_as_root ./db.sql "$db_name"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 26686d5..fb60cc3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -59,6 +59,9 @@ ynh_secure_remove "/etc/apt/sources.list.d/yarn.list"
 # Remove old log file
 ynh_secure_remove "/var/log/$app/"
 
+# Create PostgreSQL User
+ynh_psql_create_user $db_name $db_pwd
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================