Le Jeudi 18 Février 2010 09:15:56, Leo Baltus a écrit :
> Hi all,
>
> I finally got around spending some time on our amavisd set-up. We
> normally do not use the classical unix-paths for our services. So
> e.g. /etc/mail/spamassassin is not the place where we would like our
> configuration to be.
> Instead we use pathnames unique for each instance.
>
> Anyway, I found Mark had setup exactly what was needed in amavisd, but
> commented it out, so I just filled in the holes :-)
>
> The patch introduces an couple of new configuration variables without
> the need to fill them in:
>
> $sa_local_rules_dir $sa_def_rules_dir
> $sa_local_state_dir $sa_prefix_dir
>
> Also I removed a bit of 'spam' amavisd gives me when stopping, starting
> and restarting, so in the best unix tradition it just keep quiet when
> there are no errors to report. It allows me to cleanly run:
>
> sa-update && amavisd reload
>
> from cron.
>
> I hope it's OK to include it all in one patch.
>
> Mark, could you please consider applying this patch to your dev-tree?
>
> Here's the patch :
>
> --- amavisd-new-2.6.4/amavisd 2009-06-25 14:39:01.000000000 +0200
> +++ amavisd-new-2.6.4.sa-on-a-non-standard-place/amavisd 2010-02-18
> 16:09:40.128747399 +0100 @@ -385,6 +385,8 @@
> %dkim_signing_keys_by_domain
> @dkim_signing_keys_list @dkim_signing_keys_storage
> $file $altermime $enable_anomy_sanitizer
> + $sa_local_rules_dir $sa_def_rules_dir
> + $sa_local_state_dir $sa_prefix_dir
> )],
> 'sa' => # global SpamAssassin settings
> [qw(
> @@ -14014,14 +14016,14 @@
> my($msg) = !defined($killed_amavisd_pid) ? undef :
> "Daemon [$killed_amavisd_pid] terminated by
> SIG$kill_sig_used"; if ($cmd eq 'stop') {
> - if (defined $msg) { do_log(2,"%s",$msg); print STDERR "$msg\n" }
> + if (defined $msg) { do_log(2,"%s",$msg); }
> exit(0);
> }
> if (defined $killed_amavisd_pid) {
> - print STDERR "$msg, waiting for dust to settle...\n";
> + do_log (2, "$msg, waiting for dust to settle...\n");
> sleep 5; # wait for the TCP socket to be released
> }
> - print STDERR "becoming a new daemon...\n";
> + do_log(2, "becoming a new daemon...\n");
> }
> 1;
> } or do {
> @@ -22082,12 +22084,17 @@
> home_dir_for_helpers => $helpers_home,
> rules_filename => $sa_configpath,
> site_rules_filename => $sa_siteconfigpath,
> -# LOCAL_STATE_DIR => '/var/lib',
> -# PREFIX => '/usr/local',
> -# DEF_RULES_DIR => '/usr/local/share/spamassassin',
> -# LOCAL_RULES_DIR => '/usr/local/etc/mail/spamassassin',
> -#see man Mail::SpamAssassin for other options
> + #see man Mail::SpamAssassin for other options
> };
> + if (defined $sa_local_state_dir && !defined $sa_args->{LOCAL_STATE_DIR})
> + { $sa_args->{LOCAL_STATE_DIR} = $sa_local_state_dir }
> + if (defined $sa_prefix_dir && !defined $sa_args->{PREFIX})
> + { $sa_args->{PREFIX} = $sa_prefix_dir };
> + if (defined $sa_def_rules_dir && !defined $sa_args->{DEF_RULES_DIR})
> + { $sa_args->{DEF_RULES_DIR} = $sa_def_rules_dir };
> + if (defined $sa_local_rules_dir && !defined $sa_args->{LOCAL_RULES_DIR})
> + { $sa_args->{LOCAL_RULES_DIR} = $sa_local_rules_dir };
> +
> if ($sa_version_num < 3.001005 && !defined $sa_args->{LOCAL_STATE_DIR})
> { $sa_args->{LOCAL_STATE_DIR} = '/var/lib' } # don't ignore sa-update
> rules my($spamassassin_obj) = Mail::SpamAssassin->new($sa_args);
So if I dont fill
$sa_local_rules_dir $sa_def_rules_dir
$sa_local_state_dir $sa_prefix_dir
will they have default values?
wich version of amavisd is your patch appliend?
will this be in next Amavisd upstream?
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
AMaViS-user mailing list
AMaViS-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amavis-user
AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3
AMaViS-HowTos:http://www.amavis.org/howto/
