From 68ac91e9da9cb7b6cea965923f27a9ec22989b11 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 3 Oct 2023 06:16:21 +0200 Subject: [PATCH 1/7] Upgrade to v1.7.43 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0977747..078695c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grav" description.en = "Modern open source flat-file CMS" description.fr = "CMS moderne basé sur des fichiers plats" -version = "1.7.42.3~ynh1" +version = "1.7.43~ynh1" maintainers = ["tituspijean"] @@ -63,14 +63,14 @@ ram.runtime = "50M" autoupdate.upstream = "https://github.com/trilbymedia/grav-plugin-login-ldap" [resources.sources.main] - url = "https://github.com/getgrav/grav/releases/download/1.7.42.3/grav-admin-v1.7.42.3.zip" - sha256 = "243512b322d5562e620346d6b9fba33d5617c4531a685d22acfd313621bd00e7" + url = "https://github.com/getgrav/grav/releases/download/1.7.43/grav-admin-v1.7.43.zip" + sha256 = "4648a82cfbb162a0a76952c697f435861cf16d32ab85058110bfdf9bd459522a" autoupdate.strategy = "latest_github_release" autoupdate.asset = "grav-admin.*.zip" [resources.sources.app-upgrade] - url = "https://github.com/getgrav/grav/releases/download/1.7.42.3/grav-update-v1.7.42.3.zip" - sha256 = "3932e6c40101233b6e7369b989feb5ee942ec92261a9102fa6343fb7d9826ad9" + url = "https://github.com/getgrav/grav/releases/download/1.7.43/grav-update-v1.7.43.zip" + sha256 = "72ed392fa58ab20348bc795aa5150a9bf8978a3138444d0da0b9b07da630b245" autoupdate.strategy = "latest_github_release" autoupdate.asset = "grav-update.*.zip" From 4b5f24603f7de315a69d8f8c6c5601a2cf5b0c2d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 3 Oct 2023 04:16:24 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cf47c8e..b63ba5e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Grav is a modern open source flat-file CMS. -**Shipped version:** 1.7.42.3~ynh1 +**Shipped version:** 1.7.43~ynh1 **Demo:** https://getgrav.org/downloads/themes @@ -32,7 +32,6 @@ Grav is a modern open source flat-file CMS. * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 0429694..676a6b3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.42.3~ynh1 +**Version incluse :** 1.7.43~ynh1 **Démo :** https://getgrav.org/downloads/themes @@ -32,7 +32,6 @@ Un CMS moderne basé sur des fichiers plats * 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 : ## Informations pour les développeurs From 0fa6e926fcbc8b90ea9b5b23368b36cfb499c1a9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Jan 2024 17:16:32 +0100 Subject: [PATCH 3/7] Upgrade to v1.7.44 Changelog: https://github.com/getgrav/grav/releases/tag/1.7.44 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 078695c..dfe2b84 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grav" description.en = "Modern open source flat-file CMS" description.fr = "CMS moderne basé sur des fichiers plats" -version = "1.7.43~ynh1" +version = "1.7.44~ynh1" maintainers = ["tituspijean"] @@ -63,14 +63,14 @@ ram.runtime = "50M" autoupdate.upstream = "https://github.com/trilbymedia/grav-plugin-login-ldap" [resources.sources.main] - url = "https://github.com/getgrav/grav/releases/download/1.7.43/grav-admin-v1.7.43.zip" - sha256 = "4648a82cfbb162a0a76952c697f435861cf16d32ab85058110bfdf9bd459522a" + url = "https://github.com/getgrav/grav/releases/download/1.7.44/grav-admin-v1.7.44.zip" + sha256 = "e1ed0746f5c107f2e6d8f2174d8bac25abe07ccf7f8eec1e6d65c4dc63908fa5" autoupdate.strategy = "latest_github_release" autoupdate.asset = "grav-admin.*.zip" [resources.sources.app-upgrade] - url = "https://github.com/getgrav/grav/releases/download/1.7.43/grav-update-v1.7.43.zip" - sha256 = "72ed392fa58ab20348bc795aa5150a9bf8978a3138444d0da0b9b07da630b245" + url = "https://github.com/getgrav/grav/releases/download/1.7.44/grav-update-v1.7.44.zip" + sha256 = "d3766001bb3711f7c8530b0d2e8ab26c7de7bca50c1cc81b8f4792a4b926001f" autoupdate.strategy = "latest_github_release" autoupdate.asset = "grav-update.*.zip" From cbbdcbf5eebc7de3a6758266572549be8c42a4f2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Jan 2024 16:16:35 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b63ba5e..76e514c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Grav is a modern open source flat-file CMS. -**Shipped version:** 1.7.43~ynh1 +**Shipped version:** 1.7.44~ynh1 **Demo:** https://getgrav.org/downloads/themes @@ -32,6 +32,7 @@ Grav is a modern open source flat-file CMS. * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 676a6b3..319b499 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.43~ynh1 +**Version incluse :** 1.7.44~ynh1 **Démo :** https://getgrav.org/downloads/themes @@ -32,6 +32,7 @@ Un CMS moderne basé sur des fichiers plats * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 27a8a16e08a61526d86549caf21fb4d788dd6a13 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 27 Jan 2024 18:31:44 +0100 Subject: [PATCH 5/7] Fuck the stupid broken PHP-FPM config, to be standardized and integrated in the core --- config_panel.toml | 26 ---------------- scripts/config | 75 ----------------------------------------------- scripts/install | 7 ++--- scripts/upgrade | 19 +----------- 4 files changed, 4 insertions(+), 123 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 9cc4e6d..2b1a213 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -17,29 +17,3 @@ name = "Grav configuration" optional = true visible = "with_sftp" help = "If a password already exists, leave blank and it will not be replaced." - - [main.php_fpm_config] - name = "PHP-FPM configuration" - - [main.php_fpm_config.fpm_footprint] - ask = "Memory footprint" - type = "select" - choices.low = "Low, <= 20Mb per pool" - choices.medium = "Medium, between 20Mb and 40Mb per pool" - choices.high = "High, > 40Mb per pool" - choices.specific = "Use specific value" - default = "low" - - [main.php_fpm_config.fpm_free_footprint] - visible = "fpm_footprint == 'specific'" - 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" - type = "select" - 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." diff --git a/scripts/config b/scripts/config index 9eb2603..eba7e05 100644 --- a/scripts/config +++ b/scripts/config @@ -1,55 +1,10 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers ynh_abort_if_errors -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -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 VALIDATORS FOR TOML SHORT KEYS -#================================================= - #================================================= # SPECIFIC SETTERS FOR TOML SHORT KEYS #================================================= @@ -61,20 +16,6 @@ set__password() { fi } -set__fpm_footprint() { - if [ "$fpm_footprint" != "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" - fi -} - -set__fpm_free_footprint() { - if [ "$fpm_footprint" = "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_free_footprint" - fi -} - #================================================= # GENERIC FINALIZATION #================================================= @@ -86,20 +27,6 @@ ynh_app_config_validate() { then ynh_die --message="You need to set a password to enable SSH and SFTP" fi - - if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[fpm_free_footprint]}" == "true" ]; then - # If fpm_footprint is set to 'specific', use $fpm_free_footprint value. - if [ "$fpm_footprint" = "specific" ] - then - fpm_footprint=$fpm_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() { @@ -119,8 +46,6 @@ ynh_app_config_apply() { ynh_system_user_del_group --username=$app --groups="sftp.app ssh.app" usermod --shel /usr/sbin/nologin $app fi - - ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint } ynh_app_config_run $1 diff --git a/scripts/install b/scripts/install index 007f88c..d8523de 100644 --- a/scripts/install +++ b/scripts/install @@ -12,9 +12,6 @@ source /usr/share/yunohost/helpers # Initialize the SFTP setting for the config panel ynh_app_setting_set --app=$app --key=with_sftp --value="false" ynh_app_setting_set --app=$app --key=password --value=$(ynh_string_random) -ynh_app_setting_set --app=$app --key=fpm_footprint --value="medium" -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value="0" -ynh_app_setting_set --app=$app --key=fpm_usage --value="medium" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -38,7 +35,9 @@ find "$install_dir" -type d -exec chmod +s {} \; ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=medium --footprint=medium +ynh_app_setting_set --app=$app --key=fpm_footprint --value="medium" +ynh_app_setting_set --app=$app --key=fpm_usage --value="medium" +ynh_add_fpm_config #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index db91abb..06f6a74 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,29 +23,12 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=medium - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=medium - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - # If with_sftp or password don't exist, create them if [ -z "${with_sftp:-}" ] || [ -z "${password:-}" ]; then ynh_app_setting_set --app=$app --key=with_sftp --value="false" ynh_app_setting_set --app=$app --key=password --value=$(ynh_string_random) fi -# Delete existing ini configuration file (backward compatibility) -if [ -f /etc/php/$phpversion/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file=/etc/php/$phpversion/fpm/conf.d/20-$app.ini -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -72,7 +55,7 @@ find "$install_dir" -type d -exec chmod +s {} \; ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config #================================================= # NGINX CONFIGURATION From 3a8943669c1e81dcb891f0a695219ef12a3f4dcc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 Jan 2024 17:32:18 +0000 Subject: [PATCH 6/7] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index b63ba5e..572ca64 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Grav is a modern open source flat-file CMS. * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 676a6b3..2251509 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,6 +32,7 @@ Un CMS moderne basé sur des fichiers plats * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 90eb2f915fb32faf3c0ce314d90346d005dfaf26 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 27 Jan 2024 18:35:21 +0100 Subject: [PATCH 7/7] Typo --- doc/ADMIN_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index b41bbf6..47f8978 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -7,4 +7,4 @@ 1. `cd __INSTALL_DIR__` 2. `sudo -u __APP__ php__PHPVERSION__ bin/grav ...` ou `sudo -u __APP__ php__PHPVERSION__ bin/gpm ...` * Vous pouvez installer les extensions soit via le panneau d'administration, soit via GPM. -* Si vous installez Grav à la racine d'un domaine, sachez que les chemins d'accès commançant par `/yunohost` sont réservés. +* Si vous installez Grav à la racine d'un domaine, sachez que les chemins d'accès commençant par `/yunohost` sont réservés.