From: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon, 19 Sep 2022 13:15:18 +0000 (+0200)
Subject: log.dat: Add NUT entry for System Logs - Fixes bug#12921
X-Git-Tag: v2.27-core171~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a15c20fde98a4ab34242dd3cefd9bbb890394188;p=ipfire-2.x.git

log.dat: Add NUT entry for System Logs - Fixes bug#12921

- Also aligned all the code entries in %sections and %trsections

Suggested-by: Michael <ip.fire@die-fritzens.de>
Tested-by: Michael <ip.fire@die-fritzens.de>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
---

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 20f61d4eae..5fb1fcd5db 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -50,7 +50,7 @@ $cgiparams{'SECTION'} = 'ipfire';
 
 my %sections = (
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
-		'wio' => '(wio:|wio\[.*\])',
+        'wio' => '(wio:|wio\[.*\])',
         'captive' => '(Captive:)',
         'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )',
         'collectd' => '(collectd\[.*\]: )',
@@ -65,11 +65,12 @@ my %sections = (
         'kernel' => '(kernel: (?!DROP_))',
         'monit' => '(monit\[.*?\]: )',
         'ntp' => '(ntpd(?:ate)?\[.*\]: )',
-	'oinkmaster' => '(oinkmaster\[.*\]: )',
+        'nut' => '(upsmon\[.*?\]: )',
+        'oinkmaster' => '(oinkmaster\[.*\]: )',
         'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
         'pakfire' => '(pakfire:)',
         'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
-	'samba' => '(nmbd|smbd|winbind)\[\d+\]:',
+        'samba' => '(nmbd|smbd|winbind)\[\d+\]:',
         'suricata' => '(suricata: )',
         'squid' => '(squid\[.*\]: |squid: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
@@ -81,7 +82,7 @@ my %sections = (
 # Translations for the %sections array.
 my %trsections = (
         'auth' => "$Lang::tr{'loginlogout'}",
-		'wio' => 'Who Is Online?',
+        'wio' => 'Who Is Online?',
         'captive' => $Lang::tr{'Captive'},
         'clamav' => 'ClamAV',
         'collectd' => 'Collectd',
@@ -96,11 +97,12 @@ my %trsections = (
         'kernel' => "$Lang::tr{'kernel'}",
         'monit' => 'Monit',
         'ntp' => 'NTP',
-	'oinkmaster' => 'Oinkmaster',
+        'nut' => 'NUT',
+        'oinkmaster' => 'Oinkmaster',
         'openvpn' => 'OpenVPN',
         'pakfire' => 'Pakfire',
         'red' => 'RED',
-	'samba' => $Lang::tr{'samba'},
+        'samba' => $Lang::tr{'samba'},
         'suricata' => "$Lang::tr{'intrusion detection'}",
         'squid' => "$Lang::tr{'web proxy'}",
         'ssh' => 'SSH',