From 95f610b66c1d2f1e2008f6f4b687a0ebecebf7b5 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Wed, 19 Jul 2023 23:45:52 +0200 Subject: [PATCH 01/10] Add nginx settings --- .project | 11 +++++++++++ conf/mosquitto.conf | 35 ++++++++++++++++++++++++++++++++++- conf/nginx.conf | 10 ++++++++++ manifest.toml | 18 ++++++++++++++++-- scripts/backup | 6 ++++++ scripts/install | 3 +++ scripts/remove | 3 +++ scripts/restore | 2 ++ scripts/upgrade | 7 +++++++ 9 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 .project create mode 100644 conf/nginx.conf diff --git a/.project b/.project new file mode 100644 index 0000000..85a244e --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + mosquitto_ynh + + + + + + + + diff --git a/conf/mosquitto.conf b/conf/mosquitto.conf index fe46dfa..17c69c8 100644 --- a/conf/mosquitto.conf +++ b/conf/mosquitto.conf @@ -1,4 +1,37 @@ -listener __PORT__ +log_timestamp_format %Y-%m-%dT%H:%M:%S + +################### Direct IP ############################################### +#To use mosquitto with direct IP call and no websocket protocol, uncomment those lines and comment +# those for websocket protocol +#You will need to open the firewall port with command "sudo yunohost firewall allow TCP __PORT__ --no-upnp" + +#listener __PORT__ + +###################SSL CONNECTION########################################### +#To use mosquitto with direct IP and SSL connection, uncomment those lines +#You will need to open the firewall port with command "sudo yunohost firewall allow TCP __SSL_PORT__ --no-upnp" + +#listener __PORT_SSL__ +#certfile /etc/yunohost/certs/__DOMAIN__/crt.pem +#cafile /etc/yunohost/certs/__DOMAIN__/crt.pem +#keyfile /etc/yunohost/certs/__DOMAIN__/key.pem + +############################################################################## + + +#############################WEBSOCKET AND URL################################ +#To use mosquitto with websocket protocol and a direct URL call, uncomment those lines and comment +#those for direct IP + +listener __PORT__ 127.0.0.1 +listener __PORT__ ::1 + +listener __PORT_WEBSOCKET__ +protocol websockets + +############################################################################# + + allow_anonymous false password_file /etc/mosquitto/passwd diff --git a/conf/nginx.conf b/conf/nginx.conf new file mode 100644 index 0000000..03ee252 --- /dev/null +++ b/conf/nginx.conf @@ -0,0 +1,10 @@ +location / { + + #Settings for mqtt server from outside + proxy_http_version 1.1; + proxy_pass http://127.0.0.1:__PORT__; + proxy_read_timeout 90; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; +} diff --git a/manifest.toml b/manifest.toml index 9cbd3e9..28166a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Mosquitto" description.en = "Interconnect your objects and applications with an open source MQTT broker" description.fr = "Interconnecter vos objets et vos applications grâce à un serveur MQTT open source" -version = "2.0.14~ynh2" +version = "2.0.14~ynh3" maintainers = ["Grena"] @@ -30,6 +30,17 @@ ram.build = "100M" ram.runtime = "10M" [install] + [install.domain] + type = "domain" + + [install.path] + type = "path" + default = "/example" + + [install.init_main_permission] + type = "group" + default = "visitors" + [install.username] ask.en = "Set the username for client authentication" ask.fr = "Définissez le nom d'utilisateur pour l'authentification du client" @@ -52,6 +63,9 @@ ram.runtime = "10M" [resources.ports] main.default = 1883 main.exposed = "TCP" + websocket.default = 8883 + ssl.default = 8884 + [resources.apt] packages = "mosquitto" @@ -59,4 +73,4 @@ ram.runtime = "10M" [resources.apt.extras.mosquitto] repo = "deb https://repo.mosquitto.org/debian bullseye main" key = "http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key" - packages = ["mosquitto"] + packages = ["mosquitto", "mosquitto-clients"] diff --git a/scripts/backup b/scripts/backup index 030a73e..f7650e5 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,6 +15,12 @@ source /usr/share/yunohost/helpers #================================================= ynh_print_info --message="Declaring files to be backed up..." +#================================================= +# BACKUP THE NGINX CONFIGURATION +#================================================= + +ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # SPECIFIC BACKUP #================================================= diff --git a/scripts/install b/scripts/install index fe9c6e0..17be70d 100644 --- a/scripts/install +++ b/scripts/install @@ -37,6 +37,9 @@ chown -R "mosquitto" "/etc/mosquitto" #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 +# Create a dedicated NGINX config using the conf/nginx.conf template +ynh_add_nginx_config + # Use logrotate to manage application logfile(s) ynh_use_logrotate diff --git a/scripts/remove b/scripts/remove index 90333b3..2124c72 100755 --- a/scripts/remove +++ b/scripts/remove @@ -25,6 +25,8 @@ ynh_systemd_action --service_name="$app" --action="stop" pkill -u "$app" || true ynh_remove_systemd_config +ynh_remove_nginx_config + # Remove the app-specific logrotate config ynh_remove_logrotate @@ -44,6 +46,7 @@ ynh_secure_remove --file="/etc/mosquitto/passwd" # Remove the config file ynh_secure_remove --file="/etc/mosquitto/conf.d/default.conf" + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index efa60c8..105f5d1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -15,6 +15,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + ynh_restore_file --origin_path="/etc/logrotate.d/$app" yunohost service add "$app" --description="Allows MQTT clients to send/receive data" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port" diff --git a/scripts/upgrade b/scripts/upgrade index 516bae8..af20d3c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,10 @@ if [ -z "${userpass:-}" ]; then ynh_app_setting_delete --app="$app" --key="password" fi +if [ -z "${domain:-}" ]; then + ynh_die --message="This new version requires a domain, please remove and reinstall." +fi + #================================================= # SPECIFIC UPGRADE #================================================= @@ -52,6 +56,9 @@ chown -R "mosquitto" "/etc/mosquitto" #================================================= ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 +# Create a dedicated NGINX config using the conf/nginx.conf template +ynh_add_nginx_config + # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append From 5cf007f770e9d06ffcd43a8428dc2c8e3a44a62c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Feb 2024 18:20:01 +0000 Subject: [PATCH 02/10] 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 9b1e2d1..f0b9346 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 [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). -**Shipped version:** 2.0.14~ynh2 +**Shipped version:** 2.0.14~ynh3 **Demo:** https://test.mosquitto.org ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 58b2916..3999db0 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 [Mosquitto](https://mosquitto.org/) vous permet d'interconnecter vos objets et applications avec un broker MQTT open source. Le client peut publier ou s'abonner après authentification (nom d'utilisateur, mot de passe). -**Version incluse :** 2.0.14~ynh2 +**Version incluse :** 2.0.14~ynh3 **Démo :** https://test.mosquitto.org ## Documentations et ressources From 194394d9a958989eb5df75b3fa483caa83b98d6a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 29 Jun 2024 15:34:52 +0200 Subject: [PATCH 03/10] Use debian version variable --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 28166a9..9087077 100644 --- a/manifest.toml +++ b/manifest.toml @@ -71,6 +71,6 @@ ram.runtime = "10M" packages = "mosquitto" [resources.apt.extras.mosquitto] - repo = "deb https://repo.mosquitto.org/debian bullseye main" + repo = "deb https://repo.mosquitto.org/debian __YNH_DEBIAN_VERSION__ main" key = "http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key" packages = ["mosquitto", "mosquitto-clients"] From c35fcf0c84d654ed728843854455654de52ae1c6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 29 Jun 2024 13:34:55 +0000 Subject: [PATCH 04/10] Auto-update READMEs --- ALL_README.md | 8 ++++++++ README.md | 28 ++++++++++++++-------------- README_es.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 34 +++++++++++++++++----------------- README_gl.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 219 insertions(+), 31 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..152f2e7 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +- [Read the README in English](README.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) +- [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index f0b9346..31097bb 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ # Mosquitto for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mosquitto.svg)](https://dash.yunohost.org/appci/app/mosquitto) ![Working status](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Working status](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) [![Install Mosquitto with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Mosquitto 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.* +> *This package allows you to install Mosquitto 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.* ## Overview @@ -21,22 +21,22 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in **Shipped version:** 2.0.14~ynh3 -**Demo:** https://test.mosquitto.org +**Demo:** ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug or sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..696acca --- /dev/null +++ b/README_es.md @@ -0,0 +1,45 @@ + + +# Mosquitto para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) + +[![Instalar Mosquitto con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarMosquitto 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 + +[Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). + + +**Versión actual:** 2.0.14~ynh3 + +**Demo:** +## 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/mosquitto_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +o +sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_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..289c7cf --- /dev/null +++ b/README_eu.md @@ -0,0 +1,45 @@ + + +# Mosquitto YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) + +[![Instalatu Mosquitto YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Mosquitto YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +[Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). + + +**Paketatutako bertsioa:** 2.0.14~ynh3 + +**Demoa:** +## 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/mosquitto_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +edo +sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 3999db0..4d24626 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,45 +1,45 @@ # Mosquitto pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/mosquitto.svg)](https://dash.yunohost.org/appci/app/mosquitto) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) [![Installer Mosquitto avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Mosquitto 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 Mosquitto rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble [Mosquitto](https://mosquitto.org/) vous permet d'interconnecter vos objets et applications avec un broker MQTT open source. Le client peut publier ou s'abonner après authentification (nom d'utilisateur, mot de passe). -**Version incluse :** 2.0.14~ynh3 +**Version incluse :** 2.0.14~ynh3 -**Démo :** https://test.mosquitto.org +**Démo :** ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- 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 -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug ou sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..bd7f3bb --- /dev/null +++ b/README_gl.md @@ -0,0 +1,45 @@ + + +# Mosquitto para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) + +[![Instalar Mosquitto con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Mosquitto de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +[Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). + + +**Versión proporcionada:** 2.0.14~ynh3 + +**Demo:** +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +ou +sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..dd7f749 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,45 @@ + + +# YunoHost 上的 Mosquitto + +[![集成程度](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) + +[![使用 YunoHost 安装 Mosquitto](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包,您可以在 YunoHost 服务器上快速、简单地安装 Mosquitto。* +> *如果您还没有 YunoHost,请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +[Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). + + +**分发版本:** 2.0.14~ynh3 + +**演示:** +## 文档与资源 + +- 官方应用网站: +- 官方管理文档: +- 上游应用代码库: +- YunoHost 商店: +- 报告 bug: + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支,请这样操作: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +或 +sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息:** From 0c1aba14c2448b72fba55580a38ad1e5e1f836ff Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 29 Jun 2024 15:35:21 +0200 Subject: [PATCH 05/10] Fix port variable --- conf/mosquitto.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/mosquitto.conf b/conf/mosquitto.conf index 17c69c8..0fe4a71 100644 --- a/conf/mosquitto.conf +++ b/conf/mosquitto.conf @@ -9,7 +9,7 @@ log_timestamp_format %Y-%m-%dT%H:%M:%S ###################SSL CONNECTION########################################### #To use mosquitto with direct IP and SSL connection, uncomment those lines -#You will need to open the firewall port with command "sudo yunohost firewall allow TCP __SSL_PORT__ --no-upnp" +#You will need to open the firewall port with command "sudo yunohost firewall allow TCP __PORT_SSL__ --no-upnp" #listener __PORT_SSL__ #certfile /etc/yunohost/certs/__DOMAIN__/crt.pem From 69421991b23c17225a881b3f3eb716cd0f762c71 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 29 Jun 2024 15:36:09 +0200 Subject: [PATCH 06/10] Bump YunoHost requirement for debian version variable --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9087077..ceed460 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ code = "https://github.com/eclipse/mosquitto" cpe = "cpe:2.3:a:eclipse:mosquitto" [integration] -yunohost = ">= 11.0.0" +yunohost = ">= 11.2.11" architectures = "all" multi_instance = false ldap = false From 250f3762c8c30254ef3b2b45ce01ba93e9cc1238 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 29 Jun 2024 13:38:27 +0000 Subject: [PATCH 07/10] Auto-update READMEs --- README_es.md | 2 +- README_eu.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README_es.md b/README_es.md index 5428f8a..696acca 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Mosquitto para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/mosquitto.svg)](https://dash.yunohost.org/appci/app/mosquitto) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) [![Instalar Mosquitto con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) diff --git a/README_eu.md b/README_eu.md index e8a7af3..289c7cf 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Mosquitto YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/mosquitto.svg)](https://dash.yunohost.org/appci/app/mosquitto) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) [![Instalatu Mosquitto YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) diff --git a/README_gl.md b/README_gl.md index 3e9fd13..bd7f3bb 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Mosquitto para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/mosquitto.svg)](https://dash.yunohost.org/appci/app/mosquitto) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) [![Instalar Mosquitto con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 735360a..dd7f749 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Mosquitto -[![集成程度](https://dash.yunohost.org/integration/mosquitto.svg)](https://dash.yunohost.org/appci/app/mosquitto) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) [![使用 YunoHost 安装 Mosquitto](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) From b30a2be21cb7f508f429fa6e954413543094f2ec Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Aug 2024 07:17:10 +0200 Subject: [PATCH 08/10] bump to current version --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index ceed460..1f5b6e2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,9 +7,9 @@ name = "Mosquitto" description.en = "Interconnect your objects and applications with an open source MQTT broker" description.fr = "Interconnecter vos objets et vos applications grâce à un serveur MQTT open source" -version = "2.0.14~ynh3" +version = "2.0.18~ynh1" -maintainers = ["Grena"] +maintainers = [ "Grena" ] [upstream] license = "MIT" From 115f2cbc76de0cd27724e5ad1aa2588979a0c1a2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 26 Aug 2024 05:17:14 +0000 Subject: [PATCH 09/10] Auto-update READMEs --- ALL_README.md | 2 ++ README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_ru.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 9 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 README_id.md create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,6 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 31097bb..0220016 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). -**Shipped version:** 2.0.14~ynh3 +**Shipped version:** 2.0.18~ynh1 **Demo:** ## Documentation and resources diff --git a/README_es.md b/README_es.md index 696acca..09dbe37 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). -**Versión actual:** 2.0.14~ynh3 +**Versión actual:** 2.0.18~ynh1 **Demo:** ## Documentaciones y recursos diff --git a/README_eu.md b/README_eu.md index 289c7cf..215e153 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). -**Paketatutako bertsioa:** 2.0.14~ynh3 +**Paketatutako bertsioa:** 2.0.18~ynh1 **Demoa:** ## Dokumentazioa eta baliabideak diff --git a/README_fr.md b/README_fr.md index 4d24626..141f0b1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. [Mosquitto](https://mosquitto.org/) vous permet d'interconnecter vos objets et applications avec un broker MQTT open source. Le client peut publier ou s'abonner après authentification (nom d'utilisateur, mot de passe). -**Version incluse :** 2.0.14~ynh3 +**Version incluse :** 2.0.18~ynh1 **Démo :** ## Documentations et ressources diff --git a/README_gl.md b/README_gl.md index bd7f3bb..353c5bd 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). -**Versión proporcionada:** 2.0.14~ynh3 +**Versión proporcionada:** 2.0.18~ynh1 **Demo:** ## Documentación e recursos diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..0ee0a9c --- /dev/null +++ b/README_id.md @@ -0,0 +1,45 @@ + + +# Mosquitto untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) + +[![Pasang Mosquitto dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Mosquitto secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +[Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). + + +**Versi terkirim:** 2.0.18~ynh1 + +**Demo:** +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +atau +sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..7d57b8b --- /dev/null +++ b/README_ru.md @@ -0,0 +1,45 @@ + + +# Mosquitto для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/mosquitto.svg)](https://ci-apps.yunohost.org/ci/apps/mosquitto/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/mosquitto.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/mosquitto.maintain.svg) + +[![Установите Mosquitto с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mosquitto) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить Mosquitto быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +[Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). + + +**Поставляемая версия:** 2.0.18~ynh1 + +**Демо-версия:** +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +или +sudo yunohost app upgrade mosquitto -u https://github.com/YunoHost-Apps/mosquitto_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index dd7f749..086b155 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ [Mosquitto](https://mosquitto.org/) gives you interconnect your objects and applications with an open source MQTT broker. Client can publish or subscribe after authentication (username, password). -**分发版本:** 2.0.14~ynh3 +**分发版本:** 2.0.18~ynh1 **演示:** ## 文档与资源 From e01a5f1befea2f87b6d84a30715ceff2ceeb6647 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 26 Aug 2024 07:27:17 +0200 Subject: [PATCH 10/10] Update nginx.conf --- conf/nginx.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 03ee252..70bd7dc 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,12 @@ -location / { - - #Settings for mqtt server from outside +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { proxy_http_version 1.1; proxy_pass http://127.0.0.1:__PORT__; + proxy_buffering off; proxy_read_timeout 90; + proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; }