From a2d3653b9d0779c9947d182b21455ceac7747e49 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 14 May 2024 06:26:47 +0000 Subject: [PATCH 1/9] Auto-update READMEs --- ALL_README.md | 4 +++- README.md | 2 +- README_es.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 142 insertions(+), 2 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 27b6011..ee35b1e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Rspamd Web UI with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rspamdui) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Rspamd Web UI 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..144805a --- /dev/null +++ b/README_es.md @@ -0,0 +1,46 @@ + + +# Rspamd Web UI para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/rspamdui.svg)](https://dash.yunohost.org/appci/app/rspamdui) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/rspamdui.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/rspamdui.maintain.svg) + +[![Instalar Rspamd Web UI con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rspamdui) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarRspamd Web UI 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 + +Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. + +**Versión actual:** 1.0~ynh2 + +## Capturas + +![Captura de Rspamd Web UI](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web 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/rspamdui_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing --debug +o +sudo yunohost app upgrade rspamdui -u https://github.com/YunoHost-Apps/rspamdui_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..2f26db9 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,46 @@ + + +# Rspamd Web UI YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/rspamdui.svg)](https://dash.yunohost.org/appci/app/rspamdui) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/rspamdui.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/rspamdui.maintain.svg) + +[![Instalatu Rspamd Web UI YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rspamdui) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Rspamd Web UI YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. + +**Paketatutako bertsioa:** 1.0~ynh2 + +## Pantaila-argazkiak + +![Rspamd Web UI(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing --debug +edo +sudo yunohost app upgrade rspamdui -u https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..13d7ec5 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,46 @@ + + +# YunoHost 上的 Rspamd Web UI + +[![集成程度](https://dash.yunohost.org/integration/rspamdui.svg)](https://dash.yunohost.org/appci/app/rspamdui) ![工作状态](https://ci-apps.yunohost.org/ci/badges/rspamdui.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/rspamdui.maintain.svg) + +[![使用 YunoHost 安装 Rspamd Web UI](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rspamdui) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Rspamd Web UI。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. + +**分发版本：** 1.0~ynh2 + +## 截图 + +![Rspamd Web UI 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing --debug +或 +sudo yunohost app upgrade rspamdui -u https://github.com/YunoHost-Apps/rspamdui_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 449b9a95639e13041bf72aa0442f0dbb165523ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 May 2024 08:27:31 +0200 Subject: [PATCH 2/9] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 4d833d5..7d88f9d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,8 +18,11 @@ code = "https://github.com/rspamd/rspamd" yunohost = ">= 11.2" architectures = "all" multi_instance = false + ldap = false + sso = false + disk = "50M" ram.build = "500M" ram.runtime = "50M" From 4bc200b0a14106c449691bc835c815886ba81676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 May 2024 08:29:49 +0200 Subject: [PATCH 3/9] Update upgrade --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4c2bcfa..02e37e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,13 +7,6 @@ #================================================= source _common.sh -source /usr/share/yunohost/helpers - -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) #================================================= # NGINX CONFIGURATION From d0acac26b5faf835383cc9a4e23948fb7c045fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 May 2024 08:48:17 +0200 Subject: [PATCH 4/9] fix --- scripts/backup | 2 ++ scripts/restore | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/backup b/scripts/backup index 6babeb9..e099f82 100644 --- a/scripts/backup +++ b/scripts/backup @@ -21,6 +21,8 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup --src_path="/etc/rspamd/worker-controller.inc" + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 43e8fd3..8f8b146 100644 --- a/scripts/restore +++ b/scripts/restore @@ -25,6 +25,8 @@ ynh_script_progression --message="Restoring the NGINX web server configuration.. ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore_file --origin_path="/etc/rspamd/worker-controller.inc" + #================================================= # SPECIFIC RESTORATION #================================================= From ba4864d597e4936beca6269d8fcedf4d8b5a4946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 May 2024 08:48:42 +0200 Subject: [PATCH 5/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7d88f9d..3cfc49f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Rspamd Web UI" description.en = "Simple control interface for rspamd spam filtering system" description.fr = "Interface de contrôle simple pour le système de filtrage de spam rspamd" -version = "1.0~ynh2" +version = "1.0~ynh3" maintainers = [] From 22f2d1e15017806feaff6c100d323e2689d8a1f0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 14 May 2024 06:48:47 +0000 Subject: [PATCH 6/9] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ee35b1e..7bbc442 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. -**Shipped version:** 1.0~ynh2 +**Shipped version:** 1.0~ynh3 ## Screenshots diff --git a/README_es.md b/README_es.md index 144805a..51457ff 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. -**Versión actual:** 1.0~ynh2 +**Versión actual:** 1.0~ynh3 ## Capturas diff --git a/README_eu.md b/README_eu.md index 2f26db9..3f067be 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. -**Paketatutako bertsioa:** 1.0~ynh2 +**Paketatutako bertsioa:** 1.0~ynh3 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 5244bbf..46996f6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. -**Version incluse :** 1.0~ynh2 +**Version incluse :** 1.0~ynh3 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 01db4f1..23ed5aa 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. -**Versión proporcionada:** 1.0~ynh2 +**Versión proporcionada:** 1.0~ynh3 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 13d7ec5..7776fce 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Rspamdui is a simple control interface for Rspamd spam filtering system. It provides basic functions for setting metric actions, scores, viewing statistic and learning. -**分发版本：** 1.0~ynh2 +**分发版本：** 1.0~ynh3 ## 截图 From 8181b98d56a3e25fb45e8993bb4684c8599e54ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 May 2024 09:21:07 +0200 Subject: [PATCH 7/9] fix --- scripts/backup | 2 -- scripts/restore | 2 -- 2 files changed, 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index e099f82..6babeb9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -21,8 +21,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_backup --src_path="/etc/rspamd/worker-controller.inc" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 8f8b146..43e8fd3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -25,8 +25,6 @@ ynh_script_progression --message="Restoring the NGINX web server configuration.. ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/rspamd/worker-controller.inc" - #================================================= # SPECIFIC RESTORATION #================================================= From eeb8a4d02ecd98ec9f19f9c54f944ccdf6e1da9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 17 Jun 2024 21:26:47 +0200 Subject: [PATCH 8/9] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 02e37e2..cbcc416 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,6 +7,7 @@ #================================================= source _common.sh +source /usr/share/yunohost/helpers #================================================= # NGINX CONFIGURATION From c144c3a8aa5105bacb9b37adcadfc71b757990d1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 17 Jun 2024 19:26:52 +0000 Subject: [PATCH 9/9] Auto-update READMEs --- ALL_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.md) +- [Lea 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)