From 1cd5817686f84fe81fc639239bda58591f934fbd Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 6 Mar 2023 21:23:33 +0100
Subject: [PATCH] several fixes

---
 scripts/change_url | 18 +++++++++++-------
 scripts/upgrade    |  5 +++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 790e6db..8cde5a4 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -12,12 +12,14 @@ source /usr/share/yunohost/helpers
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
-# STOP SYSTEMD SERVICE
+# STOP AND REMOVE SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
+ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
+
+# Remove the dedicated systemd config
+ynh_remove_systemd_config --service="${app}"
+ynh_remove_systemd_config --service="${app}_workers"
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
-ynh_systemd_action --service_name=$app_workers --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -34,13 +36,15 @@ ynh_change_url_nginx_config
 
 #=================================================
 # GENERIC FINALISATION
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Starting the systemd services..." --weight=15
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-ynh_systemd_action --service_name=$app_workers --action="start" --log_path="/var/log/$app/$app.log"
+# Start a systemd service
+ynh_systemd_action --service_name="${app}" --action="start"  --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid"
+ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Started"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index cbe0d80..18e3866 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -95,9 +95,10 @@ yunohost service add "${app}_workers"
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Starting the systemd services..." --weight=15
 
-ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid"
+# Start a systemd service
+ynh_systemd_action --service_name="${app}" --action="start"  --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid"
 ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Started"
 
 #=================================================