From 448a890e43d0d14d6ca5c86f97a8ec1bac5ddac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 14 Mar 2023 09:27:26 +0100
Subject: [PATCH] Cleaning

---
 conf/systemd.service |  2 +-
 scripts/install      |  4 ++--
 scripts/remove       |  5 +++--
 scripts/restore      | 19 ++++++++-----------
 scripts/upgrade      | 32 ++++++++++++--------------------
 5 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index cba7645..1d1515e 100755
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Focalboard server
+Description=Focalboard: kanban board
 
 [Service]
 Type=simple
diff --git a/scripts/install b/scripts/install
index 7a295e8..af100a3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -29,9 +29,9 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
diff --git a/scripts/remove b/scripts/remove
index 2e81091..09a33e8 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,10 +10,11 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# STANDARD REMOVE
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
+# REMOVE SYSTEMD SERVICE 
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
diff --git a/scripts/restore b/scripts/restore
index f20ed4f..a0e9b50 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -37,9 +37,11 @@ ynh_script_progression --message="Restoring the PostgreSQL database..." --weight
 ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 
 #=================================================
-# RESTORE SYSTEMD
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
@@ -48,19 +50,14 @@ systemctl enable $app.service --quiet
 
 yunohost service add $app --description="Self-hosted kanban board" --log="/var/log/$app/$app.log"
 
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-# RELOAD NGINX AND PHP-FPM
+# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=2
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+
+ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log"
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c32b67e..dc8d6b6 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,36 +64,28 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# MODIFY A CONFIG FILE
-#=================================================
-ynh_script_progression --message="Modifying a config file..."
-
-ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
-chmod 600 $install_dir/config.json
-
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
-
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="Self-hosted kanban board" --log="/var/log/$app/$app.log"
 
+#=================================================
+# MODIFY A CONFIG FILE
+#=================================================
+ynh_script_progression --message="Modifying a config file..." --weight=1
+
+ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
+
+chmod 600 "$install_dir/config.json"
+chown $app:$app "$install_dir/config.json"
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================