[pmg-devel] [PATCH pmg-api v5 07/11] spamasassin: store files in dir managed by pmg

[Stoiko Ivanov]

we probably should migrate the files upon upgrading (all new installations
don't have thos settings enabled by default, but everything installed
<=7.3 should have it enabled by default - so it probably will change the
behavior for users) 

On Fri,  4 Apr 2025 15:14:34 +0200
Maximiliano Sandoval <m.sandoval at proxmox.com> wrote:

> Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
> ---
>  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 754cc791..89873f56 100644
> --- a/src/PMG/Config.pm
> +++ b/src/PMG/Config.pm
> @@ -1601,13 +1601,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 79060a08..a93f00f2 100644
> --- a/src/PMG/Report.pm
> +++ b/src/PMG/Report.pm
> @@ -125,7 +125,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 e95e6458..f46d4ccf 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,
>      });