* [pmg-devel] [RFC PATCH pmg-api] api: quarantine: include descriptions for KAM rules in the spaminfo
@ 2023-04-14 11:06 Dominik Csapak
2023-12-15 18:47 ` [pmg-devel] applied: " Stoiko Ivanov
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2023-04-14 11:06 UTC (permalink / raw)
To: pmg-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pmg-devel] applied: [RFC PATCH pmg-api] api: quarantine: include descriptions for KAM rules in the spaminfo
2023-04-14 11:06 [pmg-devel] [RFC PATCH pmg-api] api: quarantine: include descriptions for KAM rules in the spaminfo Dominik Csapak
@ 2023-12-15 18:47 ` Stoiko Ivanov
0 siblings, 0 replies; 2+ messages in thread
From: Stoiko Ivanov @ 2023-12-15 18:47 UTC (permalink / raw)
To: Dominik Csapak; +Cc: pmg-devel
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
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-15 18:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-14 11:06 [pmg-devel] [RFC PATCH pmg-api] api: quarantine: include descriptions for KAM rules in the spaminfo Dominik Csapak
2023-12-15 18:47 ` [pmg-devel] applied: " Stoiko Ivanov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox