]>
Commit | Line | Data |
---|---|---|
4395c06f MK |
1 | diff -urN amavisd-new-20030616.org/amavisd.conf amavisd-new-20030616/amavisd.conf |
2 | --- amavisd-new-20030616.org/amavisd.conf Mon Dec 1 21:43:19 2003 | |
3 | +++ amavisd-new-20030616/amavisd.conf Mon Dec 1 21:44:53 2003 | |
4 | @@ -51,17 +51,22 @@ | |
7f7d88d2 JR |
5 | # $MYHOME serves as a quick default for some other configuration settings. |
6 | # More refined control is available with each individual setting further down. | |
2a7aba10 | 7 | # $MYHOME is not used directly by the program. No trailing slash! |
7f7d88d2 | 8 | -#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis') |
e8d05b10 | 9 | +$MYHOME = '/var/spool/amavis/runtime'; # (default is '/var/amavis') |
7f7d88d2 JR |
10 | |
11 | # $mydomain serves as a quick default for some other configuration settings. | |
12 | # More refined control is available with each individual setting further down. | |
13 | # $mydomain is never used directly by the program. | |
14 | -$mydomain = 'example.com'; # (no useful default) | |
4395c06f MK |
15 | +# $mydomain = 'example.com'; # (no useful default) |
16 | + | |
e8d05b10 | 17 | +# This seems to be prefixed to host's domain name. |
4395c06f | 18 | +# You may get mail rejects of virus information as send from not |
e8d05b10 | 19 | +# existing host ( virusalert@localhost.whatever.your.domain.is ) |
4395c06f | 20 | +$mydomain = 'mail.whatever.your.domain.is'; # (no useful default) |
7f7d88d2 JR |
21 | |
22 | # Set the user and group to which the daemon will change if started as root | |
4395c06f | 23 | # (otherwise just keeps the UID unchanged, and these settings have no effect): |
7f7d88d2 JR |
24 | -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis) |
25 | -$daemon_group = 'sweep'; # (no default; customary: vscan or amavis) | |
4395c06f MK |
26 | +$daemon_user = 'amavis'; |
27 | +$daemon_group = 'amavis'; | |
7f7d88d2 JR |
28 | |
29 | # Runtime working directory (cwd), and a place where | |
30 | # temporary directories for unpacking mail are created. | |
4395c06f | 31 | @@ -141,7 +146,8 @@ |
e8d05b10 MK |
32 | # and see further down what these two lookup lists really mean. |
33 | # | |
34 | # @bypass_virus_checks_acl = qw( . ); # uncomment to DISABLE anti-virus code | |
35 | -# @bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code | |
36 | +@bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code | |
4395c06f | 37 | + |
e8d05b10 MK |
38 | # |
39 | # Any setting can be changed with a new assignment, so make sure | |
40 | # you do not unintentionally override these settings further down! | |
4395c06f | 41 | @@ -177,7 +183,7 @@ |
7f7d88d2 JR |
42 | # directly, or read from a file, one domain per line; comments and empty lines |
43 | # are ignored, a dot before a domain name implies its subdomains: | |
eda82b86 | 44 | # |
7f7d88d2 | 45 | -#read_hash(\%local_domains, '/var/amavis/local_domains'); |
4395c06f | 46 | +#read_hash(\%local_domains, '/var/spool/amavis/local_domains'); # PLD path |
7f7d88d2 JR |
47 | |
48 | #or alternatively(B), using a list of regular expressions: | |
49 | # $local_domains_re = new_RE( qr'[@.]example\.com$'i ); | |
4395c06f MK |
50 | @@ -265,7 +271,7 @@ |
51 | #$SYSLOG_LEVEL = 'user.info'; # (defaults to 'mail.info') | |
52 | ||
53 | # Log file (if not using syslog) | |
54 | -$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log) | |
55 | +# $LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log) | |
56 | ||
57 | #NOTE: levels are not strictly observed and are somewhat arbitrary | |
58 | # 0: startup/exit/failure messages, viruses detected | |
59 | @@ -274,7 +280,7 @@ | |
e8d05b10 MK |
60 | # 3: server, client |
61 | # 4: decompose parts | |
62 | # 5: more debug details | |
63 | -$log_level = 2; # (defaults to 0) | |
4395c06f | 64 | +# $log_level = 2; # (defaults to 0) |
e8d05b10 MK |
65 | |
66 | # Customizable template for the most interesting log file entry (e.g. with | |
67 | # $log_level=0) (take care to properly quote Perl special characters like '\') | |
4395c06f | 68 | @@ -406,21 +412,21 @@ |
e8d05b10 MK |
69 | # Bounces or rejects produce non-delivery status notification anyway. |
70 | ||
71 | # Notify virus sender? | |
72 | -#$warnvirussender = 1; # (defaults to false (undef)) | |
73 | +$warnvirussender = 1; # (defaults to false (undef)) | |
74 | ||
75 | # Notify spam sender? | |
76 | -#$warnspamsender = 1; # (defaults to false (undef)) | |
77 | +$warnspamsender = 1; # (defaults to false (undef)) | |
78 | ||
79 | # Notify sender of banned files? | |
80 | -#$warnbannedsender = 1; # (defaults to false (undef)) | |
81 | +$warnbannedsender = 1; # (defaults to false (undef)) | |
82 | ||
83 | # Notify sender of syntactically invalid header containing non-ASCII characters? | |
84 | #$warnbadhsender = 1; # (defaults to false (undef)) | |
85 | ||
86 | # Notify virus (or banned files) RECIPIENT? | |
87 | # (not very useful, but some policies demand it) | |
88 | -#$warnvirusrecip = 1; # (defaults to false (undef)) | |
89 | -#$warnbannedrecip = 1; # (defaults to false (undef)) | |
90 | +$warnvirusrecip = 1; # (defaults to false (undef)) | |
91 | +$warnbannedrecip = 1; # (defaults to false (undef)) | |
92 | ||
93 | # Notify also non-local virus/banned recipients if $warn*recip is true? | |
94 | # (including those not matching local_domains*) | |
4395c06f | 95 | @@ -510,7 +516,8 @@ |
eda82b86 | 96 | # or a directory (no trailing slash) |
7f7d88d2 | 97 | # (the default value is undef, meaning no quarantine) |
66ce8ece | 98 | # |
eda82b86 | 99 | -$QUARANTINEDIR = '/var/virusmails'; |
4395c06f | 100 | +# $QUARANTINEDIR = '/var/virusmails'; |
eda82b86 JR |
101 | +$QUARANTINEDIR = '/var/spool/amavis/virusmails'; |
102 | ||
7f7d88d2 JR |
103 | #$virus_quarantine_method = "local:virus-%i-%n"; # default |
104 | #$spam_quarantine_method = "local:spam-%b-%i-%n"; # default | |
4395c06f | 105 | @@ -1166,12 +1173,12 @@ |
e8d05b10 MK |
106 | # ['Sophos SAVI', \&sophos_savi ], |
107 | ||
108 | # ### http://clamav.elektrapro.com/ | |
109 | -# ['Clam Antivirus-clamd', | |
110 | -# \&ask_daemon, ["CONTSCAN {}\n", '/var/amavis/clamd'], | |
111 | -# qr/\bOK$/, qr/\bFOUND$/, | |
112 | -# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], | |
113 | -# # NOTE: run clamd under the same user as amavisd, | |
114 | -# # match the socket name in clamav.conf to the socket name in this entry | |
e8d05b10 | 115 | + ['Clam Antivirus-clamd', |
4395c06f MK |
116 | + \&ask_daemon, ["CONTSCAN {}\n", '/var/lib/clamav/clamd.socket'], |
117 | + qr/\bOK$/, qr/\bFOUND$/, | |
118 | + qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], | |
119 | + | |
e8d05b10 MK |
120 | +# NOTE: match the socket name in clamav.conf to the socket name in this entry |
121 | ||
122 | # ### http://www.openantivirus.org/ | |
123 | # ['OpenAntiVirus ScannerDaemon (OAV)', | |
4395c06f | 124 | @@ -1281,9 +1288,10 @@ |
e8d05b10 MK |
125 | '-sec -nex {}', [0], [100], |
126 | qr/was infected by virus (.+)/ ], | |
127 | ||
128 | - ['MkS_Vir for Linux (beta)', ['mks32','mks'], | |
129 | - '-s {}/*', [0], [1,2], | |
130 | - qr/--[ \t]*(.+)/ ], | |
4395c06f MK |
131 | +# Moved to secondary scanner |
132 | +# ['MkS_Vir for Linux (beta)', ['mks32','mks'], | |
133 | +# '-s {}/*', [0], [1,2], | |
134 | +# qr/--[ \t]*(.+)/ ], | |
135 | ||
136 | ['MkS_Vir daemon', | |
137 | 'mksscan', '-s -q {}', [0], [1..7], | |
138 | @@ -1400,6 +1408,10 @@ | |
139 | # # sub {$ENV{SAV_IDE}='/usr/local/sav'}, | |
140 | # ], | |
141 | ||
142 | + ['MkS_Vir for Linux (beta)', ['mks32','mks'], | |
143 | + '-s {}/*', [0], [1,2], | |
144 | + qr/--[ \t]*(.+)/ ], | |
e8d05b10 | 145 | + |
4395c06f MK |
146 | ); |
147 | ||
148 |