mbox

log.dat: Added 'squid' and 'snort', fix identation for clamav

Message ID 20160521123131.1235-1-matthias.fischer@ipfire.org
State Superseded
Headers

Message

Matthias Fischer May 21, 2016, 10:31 p.m. UTC 
  Clamav: Fix identation

Added entries in dropdown for 'Squid' and 'Snort'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 html/cgi-bin/logs.cgi/log.dat | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Michael Tremer May 23, 2016, 7:52 a.m. UTC | #1 
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
> 
> Added entries in dropdown for 'Squid' and 'Snort'.
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  html/cgi-bin/logs.cgi/log.dat | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> 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 = (
>          'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
>          'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
>          'pakfire' => '(pakfire:) ',
> -        'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
> +        'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
> +        'squid' => '(squid\[.*\]: |squid: )',
> +        'snort' => '(snort\[.*\]: )'
>  	 );

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

This looks fine. Should be its own patch.

> @@ -86,7 +88,9 @@ my %trsections = (
>          'ipsec' => 'IPSec',
>          'openvpn' => 'OpenVPN',
>          'pakfire' => 'Pakfire',
> -        'wireless' => 'Wireless'
> +        'wireless' => 'Wireless',
> +        'squid' => 'Squid',
> +        'snort' => 'Snort'
>  	);
>  

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

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

-Michael
Matthias Fischer May 23, 2016, 8:56 a.m. UTC | #2 
Hi,

On 22.05.2016 23:52, Michael Tremer wrote:
> 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
> ...

Work in progress.

I borked "--in-reply-to" while composing, so I'll make it two.

Best,
Matthias