From 5a24793fb5f950aec7ad0a733a6029fae18cb93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 5 Dec 2023 09:26:35 +0100
Subject: [PATCH] cleaning

---
 manifest.toml   |  5 ++++-
 scripts/install | 37 ++++++++++---------------------------
 scripts/upgrade | 25 ++++++++++---------------
 3 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 29dd7eb..19b08a1 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ description.fr = "Gestionnaire de téléchargement"
 
 version = "0.4.20~ynh3"
 
-maintainers = ["liberodark"]
+maintainers = []
 
 [upstream]
 license = "AGPL-3.0-or-later"
@@ -19,8 +19,11 @@ code = "https://github.com/pyload/pyload"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 5f4b97d..11c5254 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,16 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+mkdir -p /var/log/$app
+chown -R $app:$app "/var/log/$app" 
+# Use logrotate to manage application logfile(s)
+ynh_use_logrotate
+
+yunohost service add $app --log="/var/log/$app/$app.log"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -42,33 +52,6 @@ pushd $install_dir
     venv/bin/pip install --pre pyload-ng[all]
 popd
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..."
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..."
-
-mkdir -p /var/log/$app
-chown -R $app:$app "/var/log/$app" 
-# Use logrotate to manage application logfile(s)
-ynh_use_logrotate
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
-yunohost service add $app --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index c1ec1fa..94df094 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,6 +23,16 @@ 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
+
+mkdir -p /var/log/$app
+chown -R $app:$app "/var/log/$app" 
+# Use logrotate to manage app-specific logfile(s)
+ynh_use_logrotate --non-append
+
+yunohost service add $app --log="/var/log/$app/$app.log"
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -38,21 +48,6 @@ pushd $install_dir
     venv/bin/pip install --pre pyload-ng[all]
 popd
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..."
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-mkdir -p /var/log/$app
-chown -R $app:$app "/var/log/$app" 
-# Use logrotate to manage app-specific logfile(s)
-ynh_use_logrotate --non-append
-
-yunohost service add $app --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================