From 1b9373b006cb8efaa5e14d9440c864b22205766b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 29 Jan 2024 18:00:51 +0100 Subject: [PATCH] fix merge testing --- manifest.toml | 1 + scripts/install | 6 +++--- scripts/upgrade | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index bd31315..5bd7ecc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,6 +17,7 @@ website = "https://movim.eu" demo = "https://nl.movim.eu/?login" admindoc = "https://github.com/movim/movim/wiki" code = "https://github.com/movim/movim" +cpe = "cpe:2.3:a:movim:movim" [integration] yunohost = ">= 11.2" diff --git a/scripts/install b/scripts/install index 6297219..a01f656 100644 --- a/scripts/install +++ b/scripts/install @@ -50,9 +50,9 @@ ynh_install_composer ynh_composer_exec --commands="movim:migrate" #================================================= -# PHP-FPM CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low @@ -62,7 +62,7 @@ ynh_add_nginx_config # Create a dedicated systemd config ynh_add_systemd_config -yunohost service add $app --description="Responsive web-based XMPP client" --log="/var/log/$app/$app.log" +yunohost service add "$app" --description="Responsive web-based XMPP client" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index a795dad..725d5e7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,6 @@ ynh_setup_source --dest_dir="$install_dir" --full_replace=1 chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" - #================================================= # SPECIFIC UPGRADE #=================================================