From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] applied: [RFC PATCH pmg-api] api: quarantine: include descriptions for KAM rules in the spaminfo
Date: Fri, 15 Dec 2023 19:47:40 +0100 [thread overview]
Message-ID: <ZXyfTFUt1lP7cStM@rosa.proxmox.com> (raw)
In-Reply-To: <20230414110638.2491262-1-d.csapak@proxmox.com>
applied the patch after testing - huge Thanks!
the spamassassin updates have been in
/var/lib/spamassassin/$saversion/$channelurl for a very long time (at least
since 2010) - so I guess I'd consider this stable :)
On Fri, Apr 14, 2023 at 01:06:38PM +0200, Dominik Csapak wrote:
> so that the KAM rules also get a description instead of '-'
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> sending as RFC because i'm not sure if that path is fixed, and if not
> how we'd get that
>
> 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 7101795..a100e11 100644
> --- a/src/PMG/API2/Quarantine.pm
> +++ b/src/PMG/API2/Quarantine.pm
> @@ -72,8 +72,9 @@ sub decode_spaminfo {
>
> my $salocaldir = "/var/lib/spamassassin/$saversion/updates_spamassassin_org";
> my $sacustomdir = "/etc/mail/spamassassin";
> + my $kamdir = "/var/lib/spamassassin/$saversion/kam_sa-channels_mcgrail_com";
>
> - $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir, $sacustomdir]) if !$spamdesc;
> + $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir, $sacustomdir, $kamdir]) if !$spamdesc;
>
> foreach my $test (split (',', $info)) {
> my ($name, $score) = split (':', $test);
> --
> 2.30.2
>
>
>
> _______________________________________________
> pmg-devel mailing list
> pmg-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
>
>
prev parent reply other threads:[~2023-12-15 18:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 11:06 [pmg-devel] " Dominik Csapak
2023-12-15 18:47 ` 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=ZXyfTFUt1lP7cStM@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