From 87d74b60e977a94fd9ced4afd682a3544402debd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Nov 2023 17:17:27 +0100 Subject: [PATCH 1/7] Update manifest.toml --- manifest.toml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 9152eea..ce22eae 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "FluxBB" description.en = "Fast, light, user-friendly forum software" description.fr = "Forum de discussions rapide et léger" -version = "1.5.11~ynh6" +version = "1.5.12~ynh1" maintainers = ["Antoine"] @@ -17,11 +17,14 @@ admindoc = "https://fluxbb.org/docs/" code = "https://github.com/fluxbb/fluxbb/" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -48,8 +51,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/fluxbb/fluxbb/archive/refs/tags/fluxbb-1.5.11.tar.gz" - sha256 = "af464ebebb739a9aec7afbe30edf0c6afdcd7df711a73f98fb814b2bffe4bb9e" + url = "https://github.com/fluxbb/fluxbb/archive/refs/tags/fluxbb-1.4.12.tar.gz" + sha256 = "c0bb70979f80576f2b078a736cd7b0b7f3dee891006c07f7cfb66ca2ac6d0162" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -60,7 +63,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php7.4-fpm" + packages = "mariadb-server, php8.2-fpm" [resources.database] type = "mysql" From dd42a8279da86fb12d9ded9efef2e00ca1546128 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Nov 2023 16:17:32 +0000 Subject: [PATCH 2/7] 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 7418b02..0b9a83a 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 FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Shipped version:** 1.5.11~ynh6 +**Shipped version:** 1.5.12~ynh1 **Demo:** https://fluxbb.org/forums/index.php diff --git a/README_fr.md b/README_fr.md index 99fd008..d8fa85e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluxBB est conçu comme une alternative plus légère et plus rapide à certaines des applications traditionnelles de forum lourdes en fonctionnalités. Il est facile à utiliser et a fait ses preuves en matière de stabilité et de sécurité, ce qui en fait un choix de forum idéal pour votre site Web. -**Version incluse :** 1.5.11~ynh6 +**Version incluse :** 1.5.12~ynh1 **Démo :** https://fluxbb.org/forums/index.php From c7a6aa61a55cb1ed47459d6dbfff4a207a7fb0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Nov 2023 17:19:19 +0100 Subject: [PATCH 3/7] cleaning --- manifest.toml | 2 -- scripts/install | 7 +------ scripts/remove | 5 ----- scripts/restore | 21 ++++++++------------- scripts/upgrade | 7 +------ 5 files changed, 10 insertions(+), 32 deletions(-) diff --git a/manifest.toml b/manifest.toml index ce22eae..ce60ca6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,8 +41,6 @@ ram.runtime = "50M" type = "user" [install.init_main_permission] - help.en = "Visibility of the forum" - help.fr = "La visibilité du forum" type = "group" default = "visitors" diff --git a/scripts/install b/scripts/install index 7626c6c..5a8b102 100755 --- a/scripts/install +++ b/scripts/install @@ -34,13 +34,8 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 - # Create a dedicated php-fpm config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # SETUP APPLICATION WITH CURL diff --git a/scripts/remove b/scripts/remove index ae1ece0..8eda4df 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration" --wei # Remove the dedicated nginx config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration" --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 839bfc4..4d19fc1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,13 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -27,6 +20,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=1 + +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -34,12 +34,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 4f9755d..30e685c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,13 +38,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 - # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # GENERIC FINALIZATION From ab4305c322b4dd6b1135ce68d2ffc16f27758eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:57:36 +0100 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ce60ca6..4c3ad70 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "FluxBB" description.en = "Fast, light, user-friendly forum software" description.fr = "Forum de discussions rapide et léger" -version = "1.5.12~ynh1" +version = "1.5.11~ynh1" maintainers = ["Antoine"] @@ -49,8 +49,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/fluxbb/fluxbb/archive/refs/tags/fluxbb-1.4.12.tar.gz" - sha256 = "c0bb70979f80576f2b078a736cd7b0b7f3dee891006c07f7cfb66ca2ac6d0162" + url = "https://github.com/fluxbb/fluxbb/archive/refs/tags/fluxbb-1.5.11.tar.gz" + sha256 = "af464ebebb739a9aec7afbe30edf0c6afdcd7df711a73f98fb814b2bffe4bb9e" autoupdate.strategy = "latest_github_tag" [resources.system_user] From f0ac99a4367516c7212a5f01ec03831bef7ee042 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 28 Nov 2023 08:57:42 +0000 Subject: [PATCH 5/7] 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 0b9a83a..bb871eb 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 FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Shipped version:** 1.5.12~ynh1 +**Shipped version:** 1.5.11~ynh1 **Demo:** https://fluxbb.org/forums/index.php diff --git a/README_fr.md b/README_fr.md index d8fa85e..f3d79eb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FluxBB est conçu comme une alternative plus légère et plus rapide à certaines des applications traditionnelles de forum lourdes en fonctionnalités. Il est facile à utiliser et a fait ses preuves en matière de stabilité et de sécurité, ce qui en fait un choix de forum idéal pour votre site Web. -**Version incluse :** 1.5.12~ynh1 +**Version incluse :** 1.5.11~ynh1 **Démo :** https://fluxbb.org/forums/index.php From acb2402db1d805de82482e510e39d8927b758db8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 May 2024 19:09:30 +0000 Subject: [PATCH 6/7] Auto-update READMEs --- ALL_README.md | 4 +++- README.md | 2 +- README_es.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..8938aae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Lee el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 1e971cf..516382f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install FluxBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install FluxBB quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..72c0db1 --- /dev/null +++ b/README_es.md @@ -0,0 +1,50 @@ + + +# FluxBB para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/fluxbb.svg)](https://dash.yunohost.org/appci/app/fluxbb) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg) + +[![Instalar FluxBB con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarFluxBB rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. + + +**Versión actual:** 1.5.11~ynh1 + +**Demo:** + +## Capturas + +![Captura de FluxBB](./doc/screenshots/fluxbb_screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing --debug +o +sudo yunohost app upgrade fluxbb -u https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..eac8095 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,50 @@ + + +# FluxBB YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/fluxbb.svg)](https://dash.yunohost.org/appci/app/fluxbb) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg) + +[![Instalatu FluxBB YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek FluxBB YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. + + +**Paketatutako bertsioa:** 1.5.11~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![FluxBB(r)en pantaila-argazkia](./doc/screenshots/fluxbb_screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing --debug +edo +sudo yunohost app upgrade fluxbb -u https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index b6b9402..c6e5f4b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. FluxBB est conçu comme une alternative plus légère et plus rapide à certaines des applications traditionnelles de forum lourdes en fonctionnalités. Il est facile à utiliser et a fait ses preuves en matière de stabilité et de sécurité, ce qui en fait un choix de forum idéal pour votre site Web. -**Version incluse :** 1.5.11~ynh6 +**Version incluse :** 1.5.11~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 8b293a5..c3d2873 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Versión proporcionada:** 1.5.11~ynh6 +**Versión proporcionada:** 1.5.11~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..305520c --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,50 @@ + + +# YunoHost 上的 FluxBB + +[![集成程度](https://dash.yunohost.org/integration/fluxbb.svg)](https://dash.yunohost.org/appci/app/fluxbb) ![工作状态](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg) + +[![使用 YunoHost 安装 FluxBB](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 FluxBB。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. + + +**分发版本：** 1.5.11~ynh1 + +**演示：** + +## 截图 + +![FluxBB 的截图](./doc/screenshots/fluxbb_screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing --debug +或 +sudo yunohost app upgrade fluxbb -u https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 36b9267e0ee4b52be1d56f29b9dc5e76eeeef161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 May 2024 21:14:48 +0200 Subject: [PATCH 7/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4c3ad70..cf89165 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-fpm" + packages = "mariadb-server, php7.4-fpm" [resources.database] type = "mysql"