diff --git a/manifest.toml b/manifest.toml index bae51fb..3afd07e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,11 +20,14 @@ userdoc = "https://doc.endi.coop" code = "https://framagit.org/endi/endi" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -60,7 +63,7 @@ ram.runtime = "50M" [resources.apt] packages = [ - "mariadb_server", + "mariadb-server", "python3-pip", "python3-venv", "cython3", diff --git a/scripts/_common.sh b/scripts/_common.sh index 028db67..b69de61 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -22,11 +22,8 @@ __ynh_endi_build() { ynh_install_nodejs --nodejs_version=16 pushd "$install_dir/endi" 2>&1 - ynh_script_progression --message="Downloading NPM dependencies..." --weight=1 ynh_exec_as $app $ynh_node_load_PATH $ynh_npm --prefix js_sources install 2>&1 ynh_exec_as $app $ynh_node_load_PATH $ynh_npm --prefix vue_sources install 2>&1 - - ynh_script_progression --message="Building Web interface code..." --weight=1 ynh_exec_as $app $ynh_node_load_PATH make prodjs devjs prodjs2 devjs2 2>&1 \ || ynh_die --message="Build of javascript code failed, maybe because of high RAM usage!" popd 2>&1 diff --git a/scripts/upgrade b/scripts/upgrade index abeeff4..b20f459 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,7 +94,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="enDI, logiciel de comptabilité pour CAE" --log="/var/log/$app/logfile.log" +yunohost service add $app --description="enDI, logiciel de comptabilité pour CAE" --log=/var/log/$app/$app.log #================================================= # START SYSTEMD SERVICE