[pmg-devel] applied: [PATCH pmg-api] api/Quarantine: load custom rules description

[Stoiko Ivanov]

applied and sent a small refactoring - huge thanks!

On Thu, 23 Jun 2022 09:20:01 +0200
Dominik Csapak <d.csapak at proxmox.com> wrote:

> so that they show up in the ui too
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  src/PMG/API2/Quarantine.pm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm
> index 14f94c3..59eb1af 100644
> --- a/src/PMG/API2/Quarantine.pm
> +++ b/src/PMG/API2/Quarantine.pm
> @@ -71,8 +71,9 @@ sub decode_spaminfo {
>      my $saversion = Mail::SpamAssassin->VERSION;
>  
>      my $salocaldir = "/var/lib/spamassassin/$saversion/updates_spamassassin_org";
> +    my $sacustomdir = "/etc/mail/spamassassin";
>  
> -    $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir]) if !$spamdesc;
> +    $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir, $sacustomdir]) if !$spamdesc;
>  
>      foreach my $test (split (',', $info)) {
>  	my ($name, $score) = split (':', $test);