Merge pull request #59 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,7 @@
 # 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)

README.md

@@ -21,7 +21,7 @@ Monitorix is a free, open source, lightweight system monitoring tool designed to
 It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**Shipped version:** 3.15.0~ynh6
+**Shipped version:** 3.15.0~ynh7
 
 **Demo:** <https://www.fibranet.cat/monitorix/>
 

README_es.md

@@ -0,0 +1,52 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Monitorix para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/monitorix.svg)](https://dash.yunohost.org/appci/app/monitorix) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/monitorix.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/monitorix.maintain.svg)
+
+[![Instalar Monitorix con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monitorix)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarMonitorix 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
+
+Monitorix is a free, open source, lightweight system monitoring tool designed to monitor as many services and system resources as possible.
+
+It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
+
+
+**Versión actual:** 3.15.0~ynh7
+
+**Demo:** <https://www.fibranet.cat/monitorix/>
+
+## Capturas
+
+![Captura de Monitorix](./doc/screenshots/mail.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://monitorix.org>
+- Documentación administrador oficial: <https://www.monitorix.org/documentation.html>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/mikaku/Monitorix>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/monitorix>
+- Reportar un error: <https://github.com/YunoHost-Apps/monitorix_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/monitorix_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/monitorix_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade monitorix -u https://github.com/YunoHost-Apps/monitorix_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -21,7 +21,7 @@ Monitorix is a free, open source, lightweight system monitoring tool designed to
 It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**Paketatutako bertsioa:** 3.15.0~ynh6
+**Paketatutako bertsioa:** 3.15.0~ynh7
 
 **Demoa:** <https://www.fibranet.cat/monitorix/>
 

README_fr.md

@@ -21,7 +21,7 @@ Monitorix is a free, open source, lightweight system monitoring tool designed to
 It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**Version incluse :** 3.15.0~ynh6
+**Version incluse :** 3.15.0~ynh7
 
 **Démo :** <https://www.fibranet.cat/monitorix/>
 

README_gl.md

@@ -21,7 +21,7 @@ Monitorix is a free, open source, lightweight system monitoring tool designed to
 It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**Versión proporcionada:** 3.15.0~ynh6
+**Versión proporcionada:** 3.15.0~ynh7
 
 **Demo:** <https://www.fibranet.cat/monitorix/>
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Monitorix
+# YunoHost 上的 Monitorix
 
 [![集成程度](https://dash.yunohost.org/integration/monitorix.svg)](https://dash.yunohost.org/appci/app/monitorix) ![工作状态](https://ci-apps.yunohost.org/ci/badges/monitorix.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/monitorix.maintain.svg)
 
@@ -21,7 +21,7 @@ Monitorix is a free, open source, lightweight system monitoring tool designed to
 It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**分发版本：** 3.15.0~ynh6
+**分发版本：** 3.15.0~ynh7
 
 **演示：** <https://www.fibranet.cat/monitorix/>
 

conf/monitorix.conf

@@ -723,12 +723,13 @@ secure_log_date_format = %b %e
 <port>
     max = 50
     rule = 24000
-    list = 22v4, 22v6, 25v4, 25v6, 80v4, 80v6, 443v4, 443v6, 587v4, 587v6, 993v4, 993v6
+    list = {{ ssh_port }}v4, {{ ssh_port }}v6, 25v4, 25v6, 80v4, 80v6, 443v4, 443v6, 587v4, 587v6, 993v4, 993v6
     {%- for port_info in port_infos.splitlines() -%}
         {%- set port_info_array = port_info.split(',') -%}
+        {%- set proto = port_info_array[2] -%}
         {%- set ip_version = port_info_array[1] -%}
         {%- set port = port_info_array[0] -%}
-        , {{ port }}v{{ ip_version }}
+        , {{ port }}{{ proto }}{{ ip_version }}
     {%- endfor %}
     <desc>
         {{ ssh_port }}v4 = SSH,       tcp,  in,      0, {{ net_max_speed }}
@@ -749,7 +750,7 @@ secure_log_date_format = %b %e
         {%- set ip_version = port_info_array[1] %}
         {%- set port = port_info_array[0] %}
         {%- set name = port_info_array[3] %}
-        {{ port }}v{{ ip_version }} = {{ name }}, {{ proto }}{% if ip_version == '6' %}6{% endif %}, in, 0, {{ net_max_speed }}
+        {{ port }}{{ proto }}{{ ip_version }} = {{ name }}, {{ proto }}{% if ip_version == '6' %}6{% endif %}, in, 0, {{ net_max_speed }}
     {%- endfor %}
     </desc>
     graphs_per_row = 3
@@ -809,9 +810,9 @@ secure_log_date_format = %b %e
 # -----------------------------------------------------------------------------
 <mysql>
     conn_type = host
-    list = localhost
+    list = 127.0.0.1
     <desc>
-        localhost = 3306, {{ db_user }}, {{ db_pwd }}
+        127.0.0.1 = 3306, {{ db_user }}, {{ db_pwd }}
     </desc>
     rigid = 0, 2, 0, 0, 0, 0
     limit = 100, 100, 100, 100, 100, 100

conf/systemd.service

@@ -17,11 +17,7 @@ PrivateTmp=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK
 RestrictNamespaces=yes
 RestrictRealtime=yes
-DevicePolicy=closed
-ProtectClock=yes
 ProtectHostname=yes
-ProtectProc=invisible
-ProtectSystem=full
 ProtectControlGroups=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes

manifest.toml

@@ -7,7 +7,7 @@ name = "Monitorix"
 description.en = "A system monitoring tool"
 description.fr = "Un outil de monitoring système"
 
-version = "3.15.0~ynh6"
+version = "3.15.0~ynh7"
 
 maintainers = ["Josué Tille"]