From effd809a223353b7a7d6fe3b5ffcc6e16f7b0cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 12 Feb 2018 10:49:11 +0100
Subject: [PATCH] Fix backup / restore

---
 scripts/backup  | 4 ++--
 scripts/restore | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 573946e..cc03179 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -31,7 +31,7 @@ upstream_version=$(ynh_app_upstream_version)
 #=================================================
 
 domain=$(ynh_app_setting_get $app special_domain)
-final_path="/opt/yunohost/matrix-$app"
+final_path=$(ynh_app_setting_get $app final_path)
 
 #=================================================
 # STANDARD BACKUP STEPS
@@ -79,7 +79,7 @@ ynh_backup "/var/lib/matrix-$app" "data" 1
 # BACKUP THE POSTGRESQL DATABASE
 #=================================================
 
-sudo su -c "pg_dump $synapse_db_name" postgres > ${YNH_CWD}/dump.sql
+ynh_psql_dump_db "$synapse_db_name" > ${YNH_CWD}/dump.sql
 
 #=================================================
 # BACKUP SYNAPSE LOG
diff --git a/scripts/restore b/scripts/restore
index 58b59c8..b49c110 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,12 +34,9 @@ domain=$(ynh_app_setting_get $app special_domain)
 path_url=$(ynh_app_setting_get $app special_path)
 final_path=$(ynh_app_setting_get $app final_path)
 synapse_db_pwd=$(ynh_app_setting_get $app synapse_db_pwd)
-is_public=$(ynh_app_setting_get $app is_public)
-port=$(ynh_app_setting_get $app synapse_port)
 synapse_tls_port=$(ynh_app_setting_get $app synapse_tls_port)
 turnserver_tls_port=$(ynh_app_setting_get $app turnserver_tls_port)
 turnserver_alt_tls_port=$(ynh_app_setting_get $app turnserver_alt_tls_port)
-turnserver_pwd=$(ynh_app_setting_get $app turnserver_pwd)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -106,7 +103,7 @@ ynh_psql_execute_as_root \
  LC_CTYPE='C'
  template=template0
  OWNER $synapse_db_user;"
-su -c "psql $synapse_db_name" postgres < ${YNH_CWD}/dump.sql
+ynh_psql_execute_file_as_root "${YNH_CWD}/dump.sql" "$synapse_db_name"
 
 #=================================================
 # RESTORE SYSTEMD