public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] applied: [PATCH pmg-api] api/Quarantine: load custom rules description
Date: Thu, 30 Jun 2022 15:45:31 +0200	[thread overview]
Message-ID: <20220630154531.72c7d675@rosa.proxmox.com> (raw)
In-Reply-To: <20220623072001.626265-1-d.csapak@proxmox.com>

applied and sent a small refactoring - huge thanks!

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

> so that they show up in the ui too
> 
> Signed-off-by: Dominik Csapak <d.csapak@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);





      reply	other threads:[~2022-06-30 13:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-23  7:20 [pmg-devel] " Dominik Csapak
2022-06-30 13:45 ` Stoiko Ivanov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220630154531.72c7d675@rosa.proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=d.csapak@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal