* [pmg-devel] [PATCH pmg-api] api/Quarantine: load custom rules description
@ 2022-06-23 7:20 Dominik Csapak
2022-06-30 13:45 ` [pmg-devel] applied: " Stoiko Ivanov
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2022-06-23 7:20 UTC (permalink / raw)
To: pmg-devel
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);
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pmg-devel] applied: [PATCH pmg-api] api/Quarantine: load custom rules description
2022-06-23 7:20 [pmg-devel] [PATCH pmg-api] api/Quarantine: load custom rules description Dominik Csapak
@ 2022-06-30 13:45 ` Stoiko Ivanov
0 siblings, 0 replies; 2+ messages in thread
From: Stoiko Ivanov @ 2022-06-30 13:45 UTC (permalink / raw)
To: Dominik Csapak; +Cc: pmg-devel
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-30 13:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 7:20 [pmg-devel] [PATCH pmg-api] api/Quarantine: load custom rules description Dominik Csapak
2022-06-30 13:45 ` [pmg-devel] applied: " Stoiko Ivanov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal