| 1 |
--- amavisd-new-2.6.4/amavisd 2009-06-25 14:39:01.000000000 +0200 |
| 2 |
+++ amavisd-new-2.6.4.sa-on-a-non-standard-place/amavisd 2010-02-18 16:09:40.128747399 +0100 |
| 3 |
@@ -385,6 +385,8 @@ |
| 4 |
%dkim_signing_keys_by_domain |
| 5 |
@dkim_signing_keys_list @dkim_signing_keys_storage |
| 6 |
$file $altermime $enable_anomy_sanitizer |
| 7 |
+ $sa_local_rules_dir $sa_def_rules_dir |
| 8 |
+ $sa_local_state_dir $sa_prefix_dir |
| 9 |
)], |
| 10 |
'sa' => # global SpamAssassin settings |
| 11 |
[qw( |
| 12 |
@@ -14014,14 +14016,14 @@ |
| 13 |
my($msg) = !defined($killed_amavisd_pid) ? undef : |
| 14 |
"Daemon [$killed_amavisd_pid] terminated by SIG$kill_sig_used"; |
| 15 |
if ($cmd eq 'stop') { |
| 16 |
- if (defined $msg) { do_log(2,"%s",$msg); print STDERR "$msg\n" } |
| 17 |
+ if (defined $msg) { do_log(2,"%s",$msg); } |
| 18 |
exit(0); |
| 19 |
} |
| 20 |
if (defined $killed_amavisd_pid) { |
| 21 |
- print STDERR "$msg, waiting for dust to settle...\n"; |
| 22 |
+ do_log (2, "$msg, waiting for dust to settle...\n"); |
| 23 |
sleep 5; # wait for the TCP socket to be released |
| 24 |
} |
| 25 |
- print STDERR "becoming a new daemon...\n"; |
| 26 |
+ do_log(2, "becoming a new daemon...\n"); |
| 27 |
} |
| 28 |
1; |
| 29 |
} or do { |
| 30 |
@@ -22082,12 +22084,17 @@ |
| 31 |
home_dir_for_helpers => $helpers_home, |
| 32 |
rules_filename => $sa_configpath, |
| 33 |
site_rules_filename => $sa_siteconfigpath, |
| 34 |
-# LOCAL_STATE_DIR => '/var/lib', |
| 35 |
-# PREFIX => '/usr/local', |
| 36 |
-# DEF_RULES_DIR => '/usr/local/share/spamassassin', |
| 37 |
-# LOCAL_RULES_DIR => '/usr/local/etc/mail/spamassassin', |
| 38 |
-#see man Mail::SpamAssassin for other options |
| 39 |
+ #see man Mail::SpamAssassin for other options |
| 40 |
}; |
| 41 |
+ if (defined $sa_local_state_dir && !defined $sa_args->{LOCAL_STATE_DIR}) |
| 42 |
+ { $sa_args->{LOCAL_STATE_DIR} = $sa_local_state_dir } |
| 43 |
+ if (defined $sa_prefix_dir && !defined $sa_args->{PREFIX}) |
| 44 |
+ { $sa_args->{PREFIX} = $sa_prefix_dir }; |
| 45 |
+ if (defined $sa_def_rules_dir && !defined $sa_args->{DEF_RULES_DIR}) |
| 46 |
+ { $sa_args->{DEF_RULES_DIR} = $sa_def_rules_dir }; |
| 47 |
+ if (defined $sa_local_rules_dir && !defined $sa_args->{LOCAL_RULES_DIR}) |
| 48 |
+ { $sa_args->{LOCAL_RULES_DIR} = $sa_local_rules_dir }; |
| 49 |
+ |
| 50 |
if ($sa_version_num < 3.001005 && !defined $sa_args->{LOCAL_STATE_DIR}) |
| 51 |
{ $sa_args->{LOCAL_STATE_DIR} = '/var/lib' } # don't ignore sa-update rules |
| 52 |
my($spamassassin_obj) = Mail::SpamAssassin->new($sa_args); |
| 53 |
|
Parent Directory
| 
Revision Log