]>
Commit | Line | Data |
---|---|---|
5381f2c9 AA |
1 | diff -Nur old/AMAVIS.pm new/AMAVIS.pm |
2 | --- old/AMAVIS.pm 2004-07-14 14:03:53.000000000 +0000 | |
3 | +++ new/AMAVIS.pm 2004-07-14 14:11:40.000000000 +0000 | |
4 | @@ -96,7 +96,7 @@ | |
5 | ); | |
6 | ||
7 | ||
8 | -$conffile = '/etc/amavis-ng/amavis.conf'; | |
9 | +$conffile = '/etc/amavis.conf'; | |
10 | ||
11 | sub init { | |
12 | my $self = shift; | |
b3aea42a AA |
13 | diff -Nur old/doc/amavis-ng.texi new/doc/amavis-ng.texi |
14 | --- old/doc/amavis-ng.texi 2003-04-14 15:18:47.000000000 +0000 | |
15 | +++ new/doc/amavis-ng.texi 2004-07-22 21:35:13.000000000 +0000 | |
16 | @@ -335,7 +335,7 @@ | |
17 | @end menu | |
18 | ||
19 | All configuration parameters are stored in | |
20 | -@file{/etc/amavis-ng/amavis.conf} which has a INI-style layout. The | |
21 | +@file{/etc/amavis.conf} which has a INI-style layout. The | |
22 | @command{--configfile} parameter can be used to specify a different | |
23 | file. | |
24 | ||
3312cf39 AA |
25 | diff -Nur old/etc/amavis.conf new/etc/amavis.conf |
26 | --- old/etc/amavis.conf 2003-04-08 14:09:56.000000000 +0000 | |
27 | +++ new/etc/amavis.conf 2004-07-15 14:39:25.000000000 +0000 | |
28 | @@ -78,7 +78,7 @@ | |
29 | ||
30 | ;; Where should mails be unpacked to? | |
31 | ||
32 | -; unpack dir = /tmp/ | |
33 | +unpack dir = /var/spool/amavis-ng/tmp | |
34 | ||
35 | ;; Where should infected mail be stored? (Only the actual mail, not | |
36 | ;; the unpacked attachments) | |
37 | @@ -224,21 +224,15 @@ | |
38 | ||
39 | ;; Free (un)compression programs | |
40 | bzip2 = /usr/bin/bzip2 | |
41 | -arj = /usr/bin/arj | |
42 | -nomarch = /usr/bin/nomarch | |
43 | gzip = /bin/gzip | |
44 | -unzoo = /usr/bin/unzoo | |
45 | +arc = /usr/bin/arc | |
46 | +zoo = /usr/bin/zoo | |
47 | +unarj = /usr/bin/unarj | |
48 | ||
49 | ;; lha, unrar are non-free. | |
50 | ; lha = /usr/bin/lha | |
51 | ; unrar = /usr/bin/unrar | |
52 | ||
53 | -;; For arc zoo, unarj, there are free alternatives whcih are enabled | |
54 | -;; above. | |
55 | -; arc = /usr/bin/arc | |
56 | -; zoo = /usr/bin/zoo | |
57 | -; unarj = /usr/bin/unarj | |
58 | - | |
59 | [security] | |
60 | ||
61 | ;; Resource limits for unpacking each message |