From 9a8f6c3905a246cccfe5966b397a8396c021f210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 27 Oct 2023 09:12:57 +0200
Subject: [PATCH] cleaning

---
 scripts/change_url |  2 +-
 scripts/install    | 15 ++-------------
 scripts/restore    | 23 ++---------------------
 scripts/upgrade    | 11 -----------
 4 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index db32764..a639a04 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -24,7 +24,7 @@ redis_db=$(ynh_redis_get_free_db)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action=stop --log_path="systemd"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
diff --git a/scripts/install b/scripts/install
index c95c5d9..cd72d20 100644
--- a/scripts/install
+++ b/scripts/install
@@ -76,14 +76,6 @@ cp "$back" "$backend_path/vikunja"
 chmod +x "$backend_path/vikunja"
 chown -R $app:www-data "$backend_path/files"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=3
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -100,12 +92,9 @@ chown $app:$app "$backend_path/config.yml"
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_add_systemd_config
+ynh_add_nginx_config
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
+ynh_add_systemd_config
 
 yunohost service add $app --description="Self-hosted To-Do list application" --log="/var/log/$app/$app.log"
 
diff --git a/scripts/restore b/scripts/restore
index df9e294..e999a4d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,15 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -46,14 +37,11 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 #=================================================
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=5
 
+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
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
 yunohost service add $app --description="Self-hosted To-Do list application" --log="/var/log/$app/$app.log"
 
 #=================================================
@@ -63,13 +51,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server started on"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index ec696e5..97abbec 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -100,7 +100,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	# Download, check integrity, uncompress and patch the source from app.src
 	# Frontend
 	ynh_setup_source --dest_dir="$install_dir" --source_id="front"
 	
@@ -136,18 +135,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=2
-
 ynh_add_systemd_config
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
 yunohost service add $app --description="Self-hosted To-Do list application" --log="/var/log/$app/$app.log"
 
 #=================================================