From 76ca40fb7ce3e02185889cfd223e6d0c95734be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Dec 2023 21:29:08 +0100
Subject: [PATCH] cleaning

---
 manifest.toml   |  3 +++
 scripts/install | 22 ++++++----------------
 scripts/restore | 22 ++--------------------
 scripts/upgrade | 19 ++-----------------
 4 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 43f6236..9a67175 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,8 +19,11 @@ code = "https://github.com/kern/filepizza"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index b16cde3..ef2639c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -35,6 +35,12 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=4
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+env_path="$PATH"
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"
+
 #=================================================
 # INSTALL FILEPIZZA
 #=================================================
@@ -46,22 +52,6 @@ pushd "$install_dir"
 	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm run-script build
 popd
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=4
-
-env_path="$PATH"
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
-
-yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index c578403..c63a02b 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,14 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -40,14 +32,11 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=8
 
+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..." --weight=3
-
 yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"
 
 #=================================================
@@ -57,13 +46,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=8
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=2
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 6147051..f20b5da 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -47,23 +47,15 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=5
-
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=2
-
 env_path="$PATH"
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
+yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"
+
 #=================================================
 # INSTALL FILEPIZZA
 #=================================================
@@ -75,13 +67,6 @@ pushd "$install_dir"
 	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm run-script build
 popd
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================