From d22bfa62dd1181c69ac908971faa0ef9c913424b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 15 Aug 2023 11:54:58 +0200 Subject: [PATCH 1/5] Remove broken PHP-fpm config panel stuff, should be standardized in the core ... --- config_panel.toml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 config_panel.toml diff --git a/config_panel.toml b/config_panel.toml deleted file mode 100644 index 0a72452..0000000 --- a/config_panel.toml +++ /dev/null @@ -1,25 +0,0 @@ -version = "1.0" - -[main] -name = "eLabFTW configuration" - - [main.php_fpm_config] - name = "PHP-FPM configuration" - - [main.php_fpm_config.fpm_footprint] - ask = "Memory footprint of the service?" - choices = ["low", "medium", "high", "specific"] - default = "low" - help = "low <= 20Mb per pool. medium between 20Mb and 40Mb per pool. high > 40Mb per pool.
Use specific to set a value with the following option." - - [main.php_fpm_config.free_footprint] - ask = "Memory footprint of the service?" - type = "number" - default = "0" - help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." - - [main.php_fpm_config.fpm_usage] - ask = "Expected usage of the service?" - choices = ["low", "medium", "high"] - default = "low" - help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." From 3ea82dda0ff856a6409e05fbdc99b9a381958e40 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 15 Aug 2023 09:55:00 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 3 ++- README_fr.md | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 22d30a2..9c07d1f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # eLabFTW for YunoHost -[![Integration level](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![Working status](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![Working status](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) + [![Install eLabFTW with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elabftw) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 6075f8e..d733275 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # eLabFTW pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/elabftw.svg)](https://dash.yunohost.org/appci/app/elabftw) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/elabftw.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/elabftw.maintain.svg) + [![Installer eLabFTW avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elabftw) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer eLabFTW rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer eLabFTW rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble eLabFTW is an electronic lab notebook manager for research teams. @@ -23,18 +24,18 @@ It lets you store and organize your research experiments easily. It also feature **Démo :** https://demo.elabftw.net/login.php -## Captures d'écran +## Captures d’écran -![Capture d'écran de eLabFTW](./doc/screenshots/screen-1.jpg) +![Capture d’écran de eLabFTW](./doc/screenshots/screen-1.jpg) ## Avertissements / informations importantes Beware, starting with eLabFTW 4.3.0, upstream is moving away from manual installation for a full Docker installation, which will make updating th app more difficult... ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -50,4 +51,4 @@ ou sudo yunohost app upgrade elabftw -u https://github.com/YunoHost-Apps/elabftw_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From d992da381fab926dbba00f94f4deabbc8c3980ae Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 15 Aug 2023 11:55:20 +0200 Subject: [PATCH 3/5] Remove broken PHP-fpm config panel stuff, should be standardized in the core ... --- scripts/config | 95 -------------------------------------------------- 1 file changed, 95 deletions(-) delete mode 100644 scripts/config diff --git a/scripts/config b/scripts/config deleted file mode 100644 index 8a9110c..0000000 --- a/scripts/config +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source _common.sh -source /usr/share/yunohost/helpers - -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) - -#================================================= -# SPECIFIC GETTERS FOR TOML SHORT KEY -#================================================= - -get__fpm_footprint() { - # Free footprint value for php-fpm - # Check if current_fpm_footprint is an integer - if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null - then - echo "specific" - else - echo "$current_fpm_footprint" - fi -} - -get__free_footprint() { - # Free footprint value for php-fpm - # Check if current_fpm_footprint is an integer - if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null - then - # If current_fpm_footprint is an integer, that's a numeric value for the footprint - echo "$current_fpm_footprint" - else - echo "0" - fi -} - -#================================================= -# SPECIFIC SETTERS FOR TOML SHORT KEYS -#================================================= - -set__fpm_footprint() { - if [ "$fpm_footprint" != "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" - fi -} - -set__free_footprint() { - if [ "$fpm_footprint" == "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint" - fi -} - -#================================================= -# GENERIC FINALIZATION -#================================================= - -ynh_app_config_validate() { - _ynh_app_config_validate - - if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then - # If fpm_footprint is set to 'specific', use $free_footprint value. - if [ "$fpm_footprint" == "specific" ] - then - fpm_footprint=$free_footprint - fi - - if [ "$fpm_footprint" == "0" ] - then - ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below." - - exit 0 - fi - fi -} - -ynh_app_config_apply() { - _ynh_app_config_apply - - ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -} - -ynh_app_config_run $1 From b47276ad8fcd8b0ed7b7ee978ec9cb02478f421c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 15 Aug 2023 11:56:25 +0200 Subject: [PATCH 4/5] manifest: bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 633abca..0ff2ad5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source electronic lab notebook for research labs", "fr": "Cahier de laboratoire électronique open source pour les laboratoires de recherche" }, - "version": "4.2.4~ynh2", + "version": "4.2.4~ynh3", "url": "https://www.elabftw.net", "upstream": { "license": "AGPL-3.0-only", From 6828e674c80fa159f4e2cbfaa02ea0540b50db9c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 15 Aug 2023 09:56:28 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c07d1f..9ea3cbd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Shipped version:** 4.2.4~ynh2 +**Shipped version:** 4.2.4~ynh3 **Demo:** https://demo.elabftw.net/login.php diff --git a/README_fr.md b/README_fr.md index d733275..ed37f97 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ eLabFTW is an electronic lab notebook manager for research teams. It lets you store and organize your research experiments easily. It also features a database where any kind of objects (such as antibodies, plasmids, cell lines, boxes, etc.) can be stored. It is accessed via the browser. Several research teams can be hosted on the same installation. This means eLabFTW can be installed at the institute level and host all team members at the same place. This is what is done at Institut Curie and in several other research centers around the globe. -**Version incluse :** 4.2.4~ynh2 +**Version incluse :** 4.2.4~ynh3 **Démo :** https://demo.elabftw.net/login.php