From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] log.dat: Add NUT entry for System Logs - Fixes bug#12921
Date: Mon, 19 Sep 2022 15:21:09 +0200
Message-ID: <1833ad47-ffcb-8ea7-1009-c61a166821df@ipfire.org>
In-Reply-To: <20220919131518.2779-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6853131042353827883=="
List-Id: <development.lists.ipfire.org>

--===============6853131042353827883==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 19.09.2022 um 15:15 schrieb Adolf Belka:
> - Also aligned all the code entries in %sections and %trsections
>=20
> Suggested-by: Michael <ip.fire(a)die-fritzens.de>
> Tested-by: Michael <ip.fire(a)die-fritzens.de>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   html/cgi-bin/logs.cgi/log.dat | 14 ++++++++------
>   1 file changed, 8 insertions(+), 6 deletions(-)
>=20
> diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
> index 20f61d4ea..5fb1fcd5d 100644
> --- a/html/cgi-bin/logs.cgi/log.dat
> +++ b/html/cgi-bin/logs.cgi/log.dat
> @@ -50,7 +50,7 @@ $cgiparams{'SECTION'} =3D 'ipfire';
>  =20
>   my %sections =3D (
>           'auth' =3D> '(\w+\(pam_unix\)\[.*\]: )',
> -		'wio' =3D> '(wio:|wio\[.*\])',
> +        'wio' =3D> '(wio:|wio\[.*\])',
>           'captive' =3D> '(Captive:)',
>           'clamav' =3D> '(clamd\[.*\]: |freshclam\[.*\]: )',
>           'collectd' =3D> '(collectd\[.*\]: )',
> @@ -65,11 +65,12 @@ my %sections =3D (
>           'kernel' =3D> '(kernel: (?!DROP_))',
>           'monit' =3D> '(monit\[.*?\]: )',
>           'ntp' =3D> '(ntpd(?:ate)?\[.*\]: )',
> -	'oinkmaster' =3D> '(oinkmaster\[.*\]: )',
> +        'nut' =3D> '(upsmon\[.*?\]: )',
> +        'oinkmaster' =3D> '(oinkmaster\[.*\]: )',
>           'openvpn' =3D> '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
>           'pakfire' =3D> '(pakfire:)',
>           'red' =3D> '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|=
pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kerne=
l: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
> -	'samba' =3D> '(nmbd|smbd|winbind)\[\d+\]:',
> +        'samba' =3D> '(nmbd|smbd|winbind)\[\d+\]:',
>           'suricata' =3D> '(suricata: )',
>           'squid' =3D> '(squid\[.*\]: |squid: )',
>           'ssh' =3D> '(sshd(?:\(.*\))?\[.*\]: )',
> @@ -81,7 +82,7 @@ my %sections =3D (
>   # Translations for the %sections array.
>   my %trsections =3D (
>           'auth' =3D> "$Lang::tr{'loginlogout'}",
> -		'wio' =3D> 'Who Is Online?',
> +        'wio' =3D> 'Who Is Online?',
>           'captive' =3D> $Lang::tr{'Captive'},
>           'clamav' =3D> 'ClamAV',
>           'collectd' =3D> 'Collectd',
> @@ -96,11 +97,12 @@ my %trsections =3D (
>           'kernel' =3D> "$Lang::tr{'kernel'}",
>           'monit' =3D> 'Monit',
>           'ntp' =3D> 'NTP',
> -	'oinkmaster' =3D> 'Oinkmaster',
> +        'nut' =3D> 'NUT',
> +        'oinkmaster' =3D> 'Oinkmaster',
>           'openvpn' =3D> 'OpenVPN',
>           'pakfire' =3D> 'Pakfire',
>           'red' =3D> 'RED',
> -	'samba' =3D> $Lang::tr{'samba'},
> +        'samba' =3D> $Lang::tr{'samba'},
>           'suricata' =3D> "$Lang::tr{'intrusion detection'}",
>           'squid' =3D> "$Lang::tr{'web proxy'}",
>           'ssh' =3D> 'SSH',

--===============6853131042353827883==--