From 236402a0df4c38feddaa50f3d7fd0335f8d649bb Mon Sep 17 00:00:00 2001
From: denis <denis@qilk.de>
Date: Fri, 15 Nov 2024 18:29:45 -0500
Subject: [PATCH] Update scripts/restore

---
 scripts/restore | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index d906029..789a6b4 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -4,32 +4,19 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
+
 ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-### $install_dir will automatically be initialized with some decent
-### permissions by default... however, you may need to recursively reapply
-### ownership to all files such as after the ynh_setup_source step
 chown -R "$app:www-data" "$install_dir"
 
-#=================================================
-# RESTORE THE DATA DIRECTORY
-#=================================================
-ynh_script_progression "Restoring the data directory..."
-
-ynh_restore "$data_dir"
-
-### (Same as for install dir)
-chown -R "$app:www-data" "$data_dir"
-
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
@@ -40,37 +27,25 @@ ynh_mysql_db_shell < ./db.sql
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression "Restoring system configurations related to $app..."
 
-### This should be a symetric version of what happens in the install script
+ynh_script_progression "Restoring system configurations related to $app..."
 
 ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore "/etc/systemd/system/$app.service"
+
 systemctl enable "$app.service" --quiet
 
-yunohost service add "$app" --description="A short description of the app" --log="/var/log/$app/$app.log"
-
-ynh_restore "/etc/logrotate.d/$app"
-
-ynh_restore "/etc/fail2ban/jail.d/$app.conf"
-ynh_restore "/etc/fail2ban/filter.d/$app.conf"
-ynh_systemctl --action=restart --service=fail2ban
+yunohost service add "$app" --description="a beautiful and performant vault to save all your files in the cloud" --log="/var/log/$app/$app.log"
 
 #=================================================
 # RESTORE VARIOUS FILES
 #=================================================
 
 ynh_restore "/etc/cron.d/$app"
+
 ynh_restore "/etc/$app/"
 
-### For apps with huge logs, you might want to not backup logs every time:
-### The mkdir call is just here in case the log directory was not backed up.
-### mkdir -p "/var/log/$app"
-### chown $app:www-data "/var/log/$app"
-### ynh_restore "/var/log/$app/" || true
-###
-### For other apps, the simple way is better:
 ynh_restore "/var/log/$app/"
 
 #=================================================
@@ -78,7 +53,6 @@ ynh_restore "/var/log/$app/"
 #=================================================
 ynh_script_progression "Reloading NGINX web server and $app's service..."
 
-### Typically you only have either $app or PHP-FPM but not both at the same time...
 ynh_systemctl --service="$app" --action="start"
 
 ynh_systemctl --service=nginx --action=reload