From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7DFFC1FF2C6 for ; Wed, 10 Jul 2024 16:35:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 849B9CD51; Wed, 10 Jul 2024 16:36:14 +0200 (CEST) From: Maximiliano Sandoval To: pmg-devel@lists.proxmox.com Date: Wed, 10 Jul 2024 16:35:37 +0200 Message-Id: <20240710143540.434073-7-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240710143540.434073-1-m.sandoval@proxmox.com> References: <20240710143540.434073-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.127 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pmg-devel] [PATCH api v4 07/10] spamasassin: store files in dir managed by pmg 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" Signed-off-by: Maximiliano Sandoval --- src/PMG/Config.pm | 8 ++++---- src/PMG/Report.pm | 2 +- src/bin/pmg-smtp-filter | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index 95bc57b..a91bb10 100644 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -1594,13 +1594,13 @@ sub rewrite_config_spam { # delete AW and bayes databases if those features are disabled if (!$use_awl) { - $changes = 1 if unlink '/root/.spamassassin/auto-whitelist'; + $changes = 1 if unlink '/var/lib/pmg/spamassassin/auto-whitelist'; } if (!$use_bayes) { - $changes = 1 if unlink '/root/.spamassassin/bayes_journal'; - $changes = 1 if unlink '/root/.spamassassin/bayes_seen'; - $changes = 1 if unlink '/root/.spamassassin/bayes_toks'; + $changes = 1 if unlink '/var/lib/pmg/spamassassin/bayes_journal'; + $changes = 1 if unlink '/var/lib/pmg/spamassassin/bayes_seen'; + $changes = 1 if unlink '/var/lib/pmg/spamassassin/bayes_toks'; } # make sure we have the custom SA files (else cluster sync fails) diff --git a/src/PMG/Report.pm b/src/PMG/Report.pm index 100a197..3512ecf 100644 --- a/src/PMG/Report.pm +++ b/src/PMG/Report.pm @@ -123,7 +123,7 @@ sub check_dns_resolution { debug => 0, local_tests_only => 0, home_dir_for_helpers => '/root', - userstate_dir => '/root/.spamassassin', + userstate_dir => '/var/lib/pmg/spamassassin', dont_copy_prefs => 1, stop_at_threshold => 0, }); diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter index 9f46941..f9499df 100755 --- a/src/bin/pmg-smtp-filter +++ b/src/bin/pmg-smtp-filter @@ -460,7 +460,7 @@ sub pre_loop_hook { debug => 0, local_tests_only => $opt_testmode || !$rbl_checks, home_dir_for_helpers => '/root', - userstate_dir => '/root/.spamassassin', + userstate_dir => '/var/lib/pmg/spamassassin', dont_copy_prefs => 1, stop_at_threshold => 0, }); -- 2.39.2 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel