From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Dropped 'dnsmasq' from System log
Date: Thu, 08 Jun 2017 10:26:56 +0200
Message-ID: <20170608082656.18906-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6018701469622922584=="
List-Id: <development.lists.ipfire.org>

--===============6018701469622922584==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

I think we don't need this anymore...

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 html/cgi-bin/logs.cgi/log.dat | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 138bf9b7f..35977992c 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -56,8 +56,6 @@ my %sections = (
         'ddns' => '(ddns\[\d+\]:)',
         'dhcp' => '(dhcpd: )',
         'dma' => '(dma\[.*\]: )',
-        'dnsmasq' => '(dnsmasq\[.*\]: )',
-        'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',
         'guardian' => '(guardian\[.*\]: )',
         'ipfire' => '(ipfire: )',
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
@@ -69,6 +67,7 @@ my %sections = (
         'snort' => '(snort\[.*\]: )',
         'squid' => '(squid\[.*\]: |squid: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
+        'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',
         'urlfilter bl' => '(installpackage\[urlfilter\]: )',
         'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)'
 	 );
@@ -82,8 +81,6 @@ my %trsections = (
         'ddns' => "$Lang::tr{'dynamic dns'}",
         'dhcp' => "$Lang::tr{'dhcp server'}",
         'dma' => 'Mail',
-        'dnsmasq' => 'DNS: Dnsmasq',
-        'unbound' => 'DNS: Unbound',
         'guardian' => "$Lang::tr{'guardian'}",
         'ipfire' => 'IPFire',
         'ipsec' => 'IPSec',
@@ -95,6 +92,7 @@ my %trsections = (
         'snort' => "$Lang::tr{'intrusion detection'}",
         'squid' => "$Lang::tr{'web proxy'}",
         'ssh' => 'SSH',
+        'unbound' => 'DNS: Unbound',
         'urlfilter bl' => 'URLFilter Blacklist',
         'wireless' => 'Wireless'
 	);
-- 
2.13.0


--===============6018701469622922584==--