From aee03dcc29320806b5fe8eeef19c05220a73dcc5 Mon Sep 17 00:00:00 2001
From: leonard <leonard@lebasic.com>
Date: Sat, 2 Dec 2023 09:00:21 +0100
Subject: [PATCH] fix restore

---
 scripts/restore | 54 +++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index afe4dec..47f5ff2 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,6 +10,14 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_systemd_action --service_name="nginx" --action="reload"
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -17,8 +25,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # RESTORE THE DATA DIRECTORY
 #=================================================
@@ -26,37 +32,41 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-# (Same as for install dir)
-chown -R $app:www-data "$data_dir"
+ynh_script_progression --message="Set file permissions..."
+myynh_fix_file_permissions
 
 #=================================================
-# RESTORE SYSTEM CONFIGURATIONS
+# PYTHON VIRTUALENV
+# Maybe the backup contains a other Python version
 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+ynh_script_progression --message="Create and setup Python virtualenv..." --weight=45
 
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+myynh_setup_python_venv
+
+#=================================================
+# RESTORE SYSTEMD
+#=================================================
+ynh_script_progression --message="Restoring the systemd $app configuration..."
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
+ynh_systemd_action --service_name=$app --action="start" --log_path="$log_file"
 
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
 
+yunohost service add $app
+
+#=================================================
+# RESTORE THE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Setup logging..."
+
+myynh_setup_log_file
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
-
-# Typically you only have either $app or php-fpm but not both at the same time...
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================