]> git.proxmox.com Git - pmg-api.git/commitdiff
api/Quarantine: load custom rules description
authorDominik Csapak <d.csapak@proxmox.com>
Thu, 23 Jun 2022 07:20:01 +0000 (09:20 +0200)
committerStoiko Ivanov <s.ivanov@proxmox.com>
Thu, 30 Jun 2022 12:58:43 +0000 (14:58 +0200)
so that they show up in the ui too

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
src/PMG/API2/Quarantine.pm

index 14f94c39fe5b278b83b51dd9e546571c68dc62dc..59eb1af3154898a24d9c9686eebc9c880cc9a4d3 100644 (file)
@@ -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);