--- rpms/smeserver-fail2ban/contribs9/smeserver-fail2ban-0.1.18.bz10767-adminpanel.patch 2019/04/10 02:46:35 1.1 +++ rpms/smeserver-fail2ban/contribs9/smeserver-fail2ban-0.1.18.bz10767-adminpanel.patch 2019/04/10 03:26:12 1.2 @@ -342,7 +342,7 @@ diff -Nur smeserver-fail2ban-0.1.18.old/ diff -Nur smeserver-fail2ban-0.1.18.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm smeserver-fail2ban-0.1.18/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm --- smeserver-fail2ban-0.1.18.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-fail2ban-0.1.18/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fail2ban.pm 2019-04-09 22:35:27.295000000 -0400 -@@ -0,0 +1,419 @@ +@@ -0,0 +1,428 @@ +#!/usr/bin/perl -w + +package esmith::FormMagick::Panel::fail2ban; @@ -361,7 +361,7 @@ diff -Nur smeserver-fail2ban-0.1.18.old/ + +our @EXPORT = qw(get_value get_prop change_settings RemoveIP); + -+our $VERSION = sprintf '%d.%03d', q$Revision: 1.00 $ =~ /: (\d+).(\d+)/; ++our $VERSION = sprintf '%d.%03d', q$Revision: 1.1 $ =~ /: (\d+).(\d+)/; +our $db = esmith::ConfigDB->open + || warn "Couldn't open configuration database (permissions problems?)"; +my $scriptname = basename($0); @@ -678,9 +678,18 @@ diff -Nur smeserver-fail2ban-0.1.18.old/ + # for the 9 services update unless key does not exist and property does not exist and value eq default + foreach my $key (keys %services) + { -+ $rec = $db->get($key); -+ my $getprop = $db->get_prop($key,'Fail2Ban') || ""; -+ $rec->set_prop('Fail2Ban', $services{$key} ) unless ( ! $rec || (! $db->get_prop($key,'Fail2Ban') && $services{$key} eq $defaultval{$key} ) ); ++ if ($key eq "wordpress") ++ { ++ $rec = $db->get('fail2ban'); ++ my $getprop = $db->get_prop('fail2ban',$key) || ""; ++ $rec->set_prop($key, $services{$key} ) unless ( ! $rec || (! $db->get_prop('fail2ban', $key) && $services{$key} eq $defaultval{$key} ) ); ++ } ++ else ++ { ++ $rec = $db->get($key); ++ my $getprop = $db->get_prop($key,'Fail2Ban') || ""; ++ $rec->set_prop('Fail2Ban', $services{$key} ) unless ( ! $rec || (! $db->get_prop($key,'Fail2Ban') && $services{$key} eq $defaultval{$key} ) ); ++ } + } +# this seems to prevent reload of service if we update something and remove or add an ip... +# return '' unless $fm->add_new_valid_from;