From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH] log.dat: Added 'squid' and 'snort', fix identation for clamav
Date: Sun, 22 May 2016 22:52:22 +0100
Message-ID: <1463953942.19435.80.camel@ipfire.org>
In-Reply-To: <20160521123131.1235-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8974255387865767111=="
List-Id: <development.lists.ipfire.org>

--===============8974255387865767111==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

these should actually be two patches. One part is okay and I would merge that
right away. For the second part I have a question :)

On Sat, 2016-05-21 at 14:31 +0200, Matthias Fischer wrote:
> Clamav: Fix identation
>=20
> Added entries in dropdown for 'Squid' and 'Snort'.
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> =C2=A0html/cgi-bin/logs.cgi/log.dat | 10 +++++++---
> =C2=A01 file changed, 7 insertions(+), 3 deletions(-)
>=20
> diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
> index e8635d7..de5076f 100644
> --- a/html/cgi-bin/logs.cgi/log.dat
> +++ b/html/cgi-bin/logs.cgi/log.dat
> @@ -65,7 +65,9 @@ my %sections =3D (
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'ipsec' =3D> '(ipsec_=
[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'openvpn' =3D> '(open=
vpnserver\[.*\]: |.*n2n\[.*\]: )',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'pakfire' =3D> '(pakf=
ire:) ',
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'wireless' =3D> '(hostapd:=
|kernel: ath.*:|kernel: wifi[0-9]:) '
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'wireless' =3D> '(hostapd:=
|kernel: ath.*:|kernel: wifi[0-9]:) ',
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'squid' =3D> '(squid\[.*\]=
: |squid: )',
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'snort' =3D> '(snort\[.*\]=
: )'
> =C2=A0	=C2=A0);

> =C2=A0
> =C2=A0# Translations for the %sections array.
> @@ -78,7 +80,7 @@ my %trsections =3D (
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'dhcp' =3D> "$Lang::t=
r{'dhcp server'}",
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'cron' =3D> 'Cron',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'collectd' =3D> 'Coll=
ectd',
> -				'clamav' =3D> 'ClamAV',
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'clamav' =3D> 'ClamAV',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'ntp' =3D> 'NTP',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'ssh' =3D> 'SSH',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'auth' =3D> "$Lang::t=
r{'loginlogout'}",

This looks fine. Should be its own patch.

> @@ -86,7 +88,9 @@ my %trsections =3D (
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'ipsec' =3D> 'IPSec',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'openvpn' =3D> 'OpenV=
PN',
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'pakfire' =3D> 'Pakfi=
re',
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'wireless' =3D> 'Wireless'
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'wireless' =3D> 'Wireless',
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'squid' =3D> 'Squid',
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0'snort' =3D> 'Snort'
> =C2=A0	);
> =C2=A0

Can't we name these "Intrusion Detection System" and "Web Proxy"?

This would make more sense to the lesser-experienced users. Are these also tr=
anslated?

-Michael

--===============8974255387865767111==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlhRaW9XQUFvSkVJQjU4UDl2a0FrSHp3SVAvUkE4TFV5Nll2Rm43N2RhdGxUamhoa00K
MlBYcEt6dTlGRWVFTksrd0dXeDZyMDEvenozTTNiUmhlWi9UcHNRVXhNNVExVUhDdWUrQWE1WGhG
WVZQRXVqcwpOd0d5eTNYSXljb3JlcWo0V2FORHBKbUJVbnpoOVZ5c01kZGQwNjk0dTZDZi9Ua2Rk
OGx4QTVxMStQcTVzbUFKCmlRQ202YWR4Y1duRHBkZEkyQk9NeEZCRnl1VmVTeG5BZDF3dWJhTElw
SDMxUkR4bWhJbWQ2bXc1RmZRNW9odVkKVzF6RDBvSTVUR3R3bUU3RVNVVTlFV2FTdHJOZWIxWEky
MHk3UFFzbmFIMC94WExVWmV1eXl5cFdlTXpPNUFneApKU3FyUUtRZTJCSmVZOS9wL3dFNFRxZ2xW
dTVjZ2NJRitnazRhL3Q3T3lBa1Y3QlVKNEc0amY2ZmpzZXBtcDFXCmFwZDNjM0VMd0hDMWZtMW13
Skk5VXBma2ZMRk5XNUxNWEQ1YloreW5melh2OEhoQWZXbmpWOXhxUW9ZTjNsRm0KVUFLa2ZCdWtL
d3luVmxjTHZxOFFibmZRanNVQXlZQTAwREh0d3c2Z3JTSU5WUllhMHpUcXBsY3FLYUJGcTAvSQpj
ek9HRUY5OGhxZytaOUZ2U3orTmkxcHR5aUdtMmZyRFF0Vzl6cG0rK3JiQ29XQTNmaWlMRTBwZnhE
TTVNSWQ4CmNoVmtmYjFjc3NNZlZ1VVhxNXl0NXQyY3hkdE16K0lKczVXODA0Uy9TWE9BY2VGQTRw
dktUTFNKSGRvRXU5bzkKc3NYM3RpaWV6enBRSVViVitJRTUwK2F4dlpPYkNJWWZidjVPbFdpZ3Yx
RDdyUE1kUkdRazlTRzk5ejJ2WEZOZwpya1orRkJBNERMMFpMd2JKdWwxego9a3RtagotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============8974255387865767111==--