From 69ca8d466133a5d34f1268490a2e14c28da8e4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 13 May 2024 21:44:19 +0200 Subject: [PATCH] Fix port config --- conf/monitorix.conf | 7 ++++--- manifest.toml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/monitorix.conf b/conf/monitorix.conf index 4cc24ea..aef3c07 100644 --- a/conf/monitorix.conf +++ b/conf/monitorix.conf @@ -723,12 +723,13 @@ secure_log_date_format = %b %e 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 %} {{ 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 %} graphs_per_row = 3 diff --git a/manifest.toml b/manifest.toml index b3467d3..529e70a 100644 --- a/manifest.toml +++ b/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"]