]>
Commit | Line | Data |
---|---|---|
328680e3 JR |
1 | diff -ur amavisd-new-20020517.orig/amavis/amavisd.conf.in amavisd-new-20020517/amavis/amavisd.conf.in |
2 | --- amavisd-new-20020517.orig/amavis/amavisd.conf.in Fri Sep 6 19:36:07 2002 | |
3 | +++ amavisd-new-20020517/amavis/amavisd.conf.in Fri Sep 6 19:38:02 2002 | |
4 | @@ -194,7 +194,7 @@ | |
5 | # Location to put infected mail into | |
12e58877 JR |
6 | # - empty for not quarantining, may be a file (mailbox), |
7 | # or a directory (no trailing slash) | |
8 | -$QUARANTINEDIR = "/var/virusmails"; | |
9 | +$QUARANTINEDIR = "/var/spool/amavis/virusmails"; | |
10 | ||
11 | # A finer control of quarantining is available through | |
12 | # variable $virus_quarantine_to as follows: | |
328680e3 JR |
13 | diff -ur amavisd-new-20020517.orig/amavis/amavisd.in.all amavisd-new-20020517/amavis/amavisd.in.all |
14 | --- amavisd-new-20020517.orig/amavis/amavisd.in.all Fri May 17 22:53:19 2002 | |
15 | +++ amavisd-new-20020517/amavis/amavisd.in.all Fri Sep 6 19:36:50 2002 | |
16 | @@ -3477,7 +3477,7 @@ | |
17 | $spamassasin_obj = Mail::SpamAssassin->new({ | |
18 | dont_copy_prefs => 1, local_tests_only => 1 }); | |
19 | $spamassasin_obj->compile_now; # ensure all modules etc. are preloaded | |
20 | -%razor_options = ( listfile => '/var/amavis/razor.lst' ); | |
21 | +%razor_options = ( listfile => '/var/spool/amavis/razor.lst' ); | |
12e58877 | 22 | |
328680e3 JR |
23 | # Read config file, which may override default settings |
24 | read_config(); | |
25 | @@ -3506,7 +3506,7 @@ | |
26 | 'spam-quarantine' => sub { ($QUARANTINEDIR, "$VIRUSFILE.gz") }, | |
27 | 'archive-by-sender' => # just an example | |
28 | sub { my($s) = $SENDER; $s =~ s/[^a-zA-Z0-9._=@]/-/; $s =~ s/\@/=/; | |
29 | - ( '/var/virusmails', # directory (qmail style mailbox) | |
30 | + ( '/var/spool/amavis/virusmails', # directory (qmail style mailbox) | |
31 | sprintf("archive-%s-%s-%05d.gz", # suggested file name | |
32 | $s, strftime("%Y%m%d-%H%M%S",localtime), $$) ); | |
33 | }, |