From 7f3808bbc0fb2321d49fa0f84dad0b1ef2734a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 14:54:18 +0200 Subject: [PATCH] cleaning --- scripts/install | 37 ++++++++++--------------------------- scripts/restore | 2 +- scripts/upgrade | 5 +---- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/scripts/install b/scripts/install index 192e677..32a647b 100644 --- a/scripts/install +++ b/scripts/install @@ -35,6 +35,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 $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 #================================================= @@ -69,33 +79,6 @@ ynh_replace_string --match_string="8000" --replace_string="$port" --target_file= chown -R $app:$app "$install_dir" -#================================================= -# 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 $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/restore b/scripts/restore index b22e0ea..25ea55b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -43,7 +43,7 @@ mkdir -p "/var/log/$app" chown $app:$app "/var/log/$app" ynh_restore_file --origin_path="/etc/logrotate.d/$app" -yunohost service add $app --log="/var/log/$app/$app.log" +yunohost service add $app --description="Desktop you have accesss through your browser" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 39258b9..7042fc6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,16 +47,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated NGINX config ynh_add_nginx_config -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version -# Create a dedicated systemd config ynh_add_systemd_config -# Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append -yunohost service add $app --log="/var/log/$app/$app.log" +yunohost service add $app --description="Desktop you have accesss through your browser" --log="/var/log/$app/$app.log" #================================================= # SPECIFIC UPGRADE