From 477d98f4a6ae8a2f1f610b61f16fbb892a74334c Mon Sep 17 00:00:00 2001 From: Kayou Date: Mon, 29 Jul 2024 16:31:40 +0200 Subject: [PATCH 1/3] do not remove old fpm config if phpversion was none --- scripts/config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index 3d3e50b..a526285 100644 --- a/scripts/config +++ b/scripts/config @@ -112,8 +112,11 @@ ynh_app_config_apply() { if [ "${changed[phpversion]}" == "true" ] then - ynh_app_setting_set --app=$app --key=phpversion --value="${old[phpversion]}" - ynh_remove_fpm_config + if [ "${old[phpversion]}" != "none" ] + then + ynh_app_setting_set --app=$app --key=phpversion --value="${old[phpversion]}" + ynh_remove_fpm_config + fi ynh_remove_app_dependencies YNH_PHP_VERSION=$phpversion # ^ ynh_add_config replaces __PHPVERSION__ by __PHP_YNH_VERSION__... From db825702a0b895bd7476b315fdc630e5eb54af95 Mon Sep 17 00:00:00 2001 From: Kayou Date: Mon, 29 Jul 2024 16:31:58 +0200 Subject: [PATCH 2/3] bump package --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ee49d7d..fb2b587 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "My Webapp" description.en = "Custom Web app with SFTP access to serve static (HTML, CSS, JS) and PHP files" description.fr = "Application Web personnalisée avec accès SFTP pour servir des fichiers statiques (HTML, CSS, JS) et PHP" -version = "1.0~ynh17" +version = "1.0~ynh18" maintainers = [] From 991cab74e47de71e8495b9e72968c2b668d13b59 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Jul 2024 14:32:02 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c3ff178..80e33ac 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2` You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. -**Shipped version:** 1.0~ynh17 +**Shipped version:** 1.0~ynh18 ## Documentation and resources - Upstream app code repository: diff --git a/README_es.md b/README_es.md index 1c54236..36da914 100644 --- a/README_es.md +++ b/README_es.md @@ -27,7 +27,7 @@ PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2` You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. -**Versión actual:** 1.0~ynh17 +**Versión actual:** 1.0~ynh18 ## Documentaciones y recursos - Repositorio del código fuente oficial de la aplicación : diff --git a/README_eu.md b/README_eu.md index 48ee029..f86f5f1 100644 --- a/README_eu.md +++ b/README_eu.md @@ -27,7 +27,7 @@ PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2` You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. -**Paketatutako bertsioa:** 1.0~ynh17 +**Paketatutako bertsioa:** 1.0~ynh18 ## Dokumentazioa eta baliabideak - Jatorrizko aplikazioaren kode-gordailua: diff --git a/README_fr.md b/README_fr.md index 548272f..90b62d2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ La version de PHP-FPM peut aussi être choisie, parmi `none`, `7.4`, `8.0`, `8.1 L'application vous permet aussi de gérer - si vous activez l'option dans le panneau de configuration - la gestion des erreurs 404, il vous suffit de créer un dossier `error` dans le répertoire racine `www` et d'y placer vos fichiers d'erreur `html` -**Version incluse :** 1.0~ynh17 +**Version incluse :** 1.0~ynh18 ## Documentations et ressources - Dépôt de code officiel de l’app : diff --git a/README_gl.md b/README_gl.md index 82af726..f1a6599 100644 --- a/README_gl.md +++ b/README_gl.md @@ -27,7 +27,7 @@ PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2` You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. -**Versión proporcionada:** 1.0~ynh17 +**Versión proporcionada:** 1.0~ynh18 ## Documentación e recursos - Repositorio de orixe do código: diff --git a/README_id.md b/README_id.md index 5b323c4..a0d5cc7 100644 --- a/README_id.md +++ b/README_id.md @@ -27,7 +27,7 @@ PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2` You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. -**Versi terkirim:** 1.0~ynh17 +**Versi terkirim:** 1.0~ynh18 ## Dokumentasi dan sumber daya - Depot kode aplikasi hulu: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 15676af..b419539 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -27,7 +27,7 @@ PHP-FPM version can also be selected among `none`, `7.4`, `8.0`, `8.1` and `8.2` You can also customize 404 errors - if you enable the option in the config panel. Simply create an `error` folder in the `www` root directory, containing your custom `html` files. -**分发版本：** 1.0~ynh17 +**分发版本：** 1.0~ynh18 ## 文档与资源 - 上游应用代码库：