From 63a622214ff0ab8ce7725b97639348cdb2202be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 May 2024 07:07:05 +0200 Subject: [PATCH] cleaning --- manifest.toml | 3 +++ scripts/install | 2 +- scripts/upgrade | 18 ++++-------------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5787eee..fb4994b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,8 +19,11 @@ code = "https://github.com/glpi-project/glpi" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index 22e91da..58fbb56 100644 --- a/scripts/install +++ b/scripts/install @@ -31,7 +31,7 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" #================================================= # SPECIFIC SETUP diff --git a/scripts/upgrade b/scripts/upgrade index c42b300..715aaaa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,23 +9,13 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -41,7 +31,7 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" #================================================= # SPECIFIC UPGRADE