From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4A38670EC8 for ; Thu, 23 Jun 2022 09:20:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 40E4322347 for ; Thu, 23 Jun 2022 09:20:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C3C142233E for ; Thu, 23 Jun 2022 09:20:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 94A2D43C1A for ; Thu, 23 Jun 2022 09:20:01 +0200 (CEST) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Thu, 23 Jun 2022 09:20:01 +0200 Message-Id: <20220623072001.626265-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.100 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [quarantine.pm] Subject: [pmg-devel] [PATCH pmg-api] api/Quarantine: load custom rules description X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2022 07:20:02 -0000 so that they show up in the ui too Signed-off-by: Dominik Csapak --- 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