[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9961167a52ef80da63f8bc065360119de688f727

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9961167a52ef80da63f8bc065360119de688f727

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2997 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9961167a52ef80da63f8bc065360119de688f727 (commit)
       via  830dfc978c00ac2134f6f4bcd26227182fd3212f (commit)
      from  a8387f8d6e246ec8d84e113468bb3c4793afad9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9961167a52ef80da63f8bc065360119de688f727
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon May 20 07:14:12 2019 +0200

    core132: add log.dat to updater
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 830dfc978c00ac2134f6f4bcd26227182fd3212f
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date:   Sun May 19 15:54:32 2019 +0200

    suricata: Fixed logs.dat regex for suricata
    
    Fixes: #12084
    
    Since the Suricata regex did not match the messages output, Suricata was not displayed in the "System Logs" section in the WUI.
    
    Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/132/filelists/files | 1 +
 html/cgi-bin/logs.cgi/log.dat             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files
index ab3520b40..f62f14099 100644
--- a/config/rootfiles/core/132/filelists/files
+++ b/config/rootfiles/core/132/filelists/files
@@ -11,6 +11,7 @@ opt/pakfire/pakfire
 srv/web/ipfire/cgi-bin/captive.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/routing.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 136fed77c..061525382 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -67,7 +67,7 @@ my %sections = (
         '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\[.*\])',
-        'suricata' => '(suricata\[.*\]: )',
+        'suricata' => '(suricata: )',
         'squid' => '(squid\[.*\]: |squid: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
         'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',


hooks/post-receive
--
IPFire 2.x development tree