From 6eb006d8fb1527d27a013c6d2c4755824b92b327 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 13 Jan 2024 09:35:05 +0100
Subject: [PATCH] cleaning

---
 scripts/restore |  5 -----
 scripts/upgrade | 22 +++++-----------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 8d7b924..1fde7af 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -61,11 +61,6 @@ ynh_script_progression --message="Restoring the systemd configuration..."
 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="$app daemon for Wiki.js" --log="/var/log/$app/$app.log"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index d5d8d55..fb22e13 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -89,6 +89,11 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/log/$app/$app.log"
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -101,23 +106,6 @@ ynh_add_config --template="config.sample.yml" --destination="$install_dir/config
 chmod 400 "$install_dir/config.yml"
 chown $app:$app "$install_dir/config.yml"
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..."
-
-# 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="$app daemon for Wiki.js" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================