logs.cgi/log.dat: Create a unified DNS section to Unbound, too

We want to keep this so that people can go back and view Unbound logs
for a little while.

Signed-off-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 6c74dbcfd4915203721d623265d829e72a5116ee..90f675008b49b08ea1a85a270a5e945e07410634 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -59,13 +59,13 @@ my %sections = (
         'ddns' => '(ddns\[\d+\]:)',
         'dhcp' => '(dhcpd: )',
         'dma' => '(dma: |dma\[.*\]: |postfix/\w*\[\d*\]: )',
+        'dns' => '(knot_resolver.*: |supervisord: |kresd\[.*\]: |unbound: \[.*?\])',
         'guardian' => '(guardian\[.*\]: )',
         'haproxy' => '(haproxy\[.*?\]: )',
         'ipblocklist' => '(ipblocklist: )',
         'ipfire' => '(ipfire: )',
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'kernel' => '(kernel: (?!DROP_))',
-       'knot-resolver' => '(knot_resolver.*: |supervisord: |kresd\[.*\]: )',
         'monit' => '(monit\[.*?\]: )',
         'ntp' => '(ntpd(?:ate)?\[.*\]: )',
         'nut' => '(upsmon\[.*?\]: )',
@@ -94,13 +94,13 @@ my %trsections = (
         'ddns' => "$Lang::tr{'dynamic dns'}",
         'dhcp' => "$Lang::tr{'dhcp server'}",
         'dma' => 'Mail',
+       'dns' => $Lang::tr{'dns title'},
         'guardian' => "$Lang::tr{'guardian'}",
         'haproxy' => 'HAProxy',
         'ipblocklist' => "$Lang::tr{'ipblocklist'}",
         'ipfire' => 'IPFire',
         'ipsec' => 'IPSec',
         'kernel' => "$Lang::tr{'kernel'}",
-       'knot-resolver' => 'DNS: Knot-Resolver',
         'monit' => 'Monit',
         'ntp' => 'NTP',
         'nut' => 'NUT',