From 3934fc711decbfa0b2fd2a89406260d7a65b8e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 8 Mar 2023 22:30:37 +0100
Subject: [PATCH] fix

---
 scripts/restore | 34 +++++++++-------------------------
 scripts/upgrade | 27 +++++++--------------------
 2 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 4e4aab3..11d22b1 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"
 
@@ -28,6 +27,11 @@ ynh_script_progression --message="Restoring the NGINX web server configuration..
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
+systemctl enable $app.service --quiet
+
+yunohost service add $app --description="Web-based music collection server and streamer"
+
 #=================================================
 # RESTORE VARIOUS FILES
 #=================================================
@@ -38,34 +42,14 @@ ynh_restore_file --origin_path="/var/lib/$app"
 chmod 600 "/var/lib/$app/navidrome.toml"
 chown -R $app "/var/lib/$app"
 
-#=================================================
-# RESTORE SYSTEMD
-#=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=5
-
-ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service --quiet
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
-yunohost service add $app --description="Web-based music collection server and streamer"
-
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Version:"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-# RELOAD NGINX
+# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+
+ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Version:"
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 807eee8..1f3448d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -79,18 +79,22 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH
 fi
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=5
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+yunohost service add $app --description="Web-based music collection server and streamer"
+
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
@@ -104,23 +108,6 @@ ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/n
 chmod 600 "$config_path/navidrome.toml"
 chown -R $app:$app "$config_path"
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=2
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
-yunohost service add $app --description="Web-based music collection server and streamer"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================