From: Adolf Belka <adolf.belka@ipfire.org>
Date: Tue, 21 Feb 2023 13:55:17 +0000 (+0100)
Subject: log.dat: Fixes bug#12950 - adding apcupsd to system logs list
X-Git-Tag: v2.27-core174~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=284ebca0577fe41ee914e70c72865794be705c01;p=ipfire-2.x.git

log.dat: Fixes bug#12950 - adding apcupsd to system logs list

- Patch tested out on my production system that has apcupsd running on it. APCUPS was
   in the list of options in the system logs and entries from apcupsd were extracted
   correctly in the wui.

Fixes: Bug#12950
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 5fb1fcd5db..bf71b3c9f6 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -49,6 +49,7 @@ $cgiparams{'ACTION'} = '';
 $cgiparams{'SECTION'} = 'ipfire';
 
 my %sections = (
+        'apcupsd' => '(apcupsd\[.*?\]: )',
         'auth' => '(\w+\(pam_unix\)\[.*\]: )',
         'wio' => '(wio:|wio\[.*\])',
         'captive' => '(Captive:)',
@@ -81,6 +82,7 @@ my %sections = (
 
 # Translations for the %sections array.
 my %trsections = (
+        'apcupsd' => 'APCUPS',
         'auth' => "$Lang::tr{'loginlogout'}",
         'wio' => 'Who Is Online?',
         'captive' => $Lang::tr{'Captive'},