1 diff -urN amavisd-new-20030616.orig/amavisd.conf amavisd-new-20030616/amavisd.conf
2 --- amavisd-new-20030616.orig/amavisd.conf Thu Aug 28 12:08:30 2003
3 +++ amavisd-new-20030616/amavisd.conf Thu Aug 28 12:10:41 2003
5 # $MYHOME serves as a quick default for some other configuration settings.
6 # More refined control is available with each individual setting further down.
7 # $MYHOME is not used directly by the program. No trailing slash!
8 -#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
9 +$MYHOME = '/var/spool/amavis/runtime'; # (default is '/var/amavis')
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)
15 +# This seems to be prefixed to host's domain name.
16 +# You may get mail rejects of virus information as send from not
17 +# existing host ( virusalert@localhost.whatever.your.domain.is )
18 +$mydomain = 'localhost'; # (no useful default)
20 # Set the user and group to which the daemon will change if started as root
21 # (otherwise just keep the UID unchanged, and these settings have no effect):
22 -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
23 -$daemon_group = 'sweep'; # (no default; customary: vscan or amavis)
24 +$daemon_user = 'amavis'; # (no default; customary: vscan or amavis)
25 +$daemon_group = 'amavis'; # (no default; customary: vscan or amavis)
27 # Runtime working directory (cwd), and a place where
28 # temporary directories for unpacking mail are created.
30 # and see further down what these two lookup lists really mean.
32 # @bypass_virus_checks_acl = qw( . ); # uncomment to DISABLE anti-virus code
33 -# @bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code
34 +@bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code
36 # Any setting can be changed with a new assignment, so make sure
37 # you do not unintentionally override these settings further down!
39 # directly, or read from a file, one domain per line; comments and empty lines
40 # are ignored, a dot before a domain name implies its subdomains:
42 -#read_hash(\%local_domains, '/var/amavis/local_domains');
43 +#read_hash(\%local_domains, '/var/spool/amavis/local_domains');
45 #or alternatively(B), using a list of regular expressions:
46 # $local_domains_re = new_RE( qr'[@.]example\.com$'i );
50 # 5: more debug details
51 -$log_level = 2; # (defaults to 0)
52 +$log_level = 0; # (defaults to 0)
54 # Customizable template for the most interesting log file entry (e.g. with
55 # $log_level=0) (take care to properly quote Perl special characters like '\')
57 # or later; second argument is ignored otherwise. See PerlIO::encoding,
58 # Encode::PerlIO and perluniintro man pages.
60 -# $notify_sender_templ = read_text('/var/amavis/notify_sender.txt');
61 -# $notify_virus_sender_templ= read_text('/var/amavis/notify_virus_sender.txt');
62 -# $notify_virus_admin_templ = read_text('/var/amavis/notify_virus_admin.txt');
63 -# $notify_virus_recips_templ= read_text('/var/amavis/notify_virus_recips.txt');
64 -# $notify_spam_sender_templ = read_text('/var/amavis/notify_spam_sender.txt');
65 -# $notify_spam_admin_templ = read_text('/var/amavis/notify_spam_admin.txt');
66 +# $notify_sender_templ = read_text('/var/spool/amavis/notify_sender.txt');
67 +# $notify_virus_sender_templ= read_text('/var/spool/amavis/notify_virus_sender.txt');
68 +# $notify_virus_admin_templ = read_text('/var/spool/amavis/notify_virus_admin.txt');
69 +# $notify_virus_recips_templ= read_text('/var/spool/amavis/notify_virus_recips.txt');
70 +# $notify_spam_sender_templ = read_text('/var/spool/amavis/notify_spam_sender.txt');
71 +# $notify_spam_admin_templ = read_text('/var/spool/amavis/notify_spam_admin.txt');
73 # If notification template files are collectively available in some directory,
74 # use read_l10n_templates which calls read_text for each known template.
76 # Bounces or rejects produce non-delivery status notification anyway.
78 # Notify virus sender?
79 -#$warnvirussender = 1; # (defaults to false (undef))
80 +$warnvirussender = 1; # (defaults to false (undef))
83 -#$warnspamsender = 1; # (defaults to false (undef))
84 +$warnspamsender = 1; # (defaults to false (undef))
86 # Notify sender of banned files?
87 -#$warnbannedsender = 1; # (defaults to false (undef))
88 +$warnbannedsender = 1; # (defaults to false (undef))
90 # Notify sender of syntactically invalid header containing non-ASCII characters?
91 #$warnbadhsender = 1; # (defaults to false (undef))
93 # Notify virus (or banned files) RECIPIENT?
94 # (not very useful, but some policies demand it)
95 -#$warnvirusrecip = 1; # (defaults to false (undef))
96 -#$warnbannedrecip = 1; # (defaults to false (undef))
97 +$warnvirusrecip = 1; # (defaults to false (undef))
98 +$warnbannedrecip = 1; # (defaults to false (undef))
100 # Notify also non-local virus/banned recipients if $warn*recip is true?
101 # (including those not matching local_domains*)
102 -#$warn_offsite = 1; # (defaults to false (undef), i.e. only notify locals)
103 +$warn_offsite = 1; # (defaults to false (undef), i.e. only notify locals)
106 # Treat envelope sender address as unreliable and don't send sender
108 # or a directory (no trailing slash)
109 # (the default value is undef, meaning no quarantine)
111 -$QUARANTINEDIR = '/var/virusmails';
112 +$QUARANTINEDIR = '/var/spool/amavis/virusmails';
114 #$virus_quarantine_method = "local:virus-%i-%n"; # default
115 #$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
117 # a hash lookup table can be read from a file,
118 # one address per line, comments and empty lines are permitted:
120 -# read_hash(\%whitelist_sender, '/var/amavis/whitelist_sender');
121 +# read_hash(\%whitelist_sender, '/var/spool/amavis/whitelist_sender');
123 # ... or set directly:
125 @@ -1152,12 +1155,12 @@
126 # ['Sophos SAVI', \&sophos_savi ],
128 # ### http://clamav.elektrapro.com/
129 -# ['Clam Antivirus-clamd',
130 -# \&ask_daemon, ["CONTSCAN {}\n", '/var/amavis/clamd'],
131 -# qr/\bOK$/, qr/\bFOUND$/,
132 -# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
133 -# # NOTE: run clamd under the same user as amavisd,
134 -# # match the socket name in clamav.conf to the socket name in this entry
136 + ['Clam Antivirus-clamd',
137 + \&ask_daemon, ["CONTSCAN {}\n", '/var/lib/clamav/clamd.socket'],
138 + qr/\bOK$/, qr/\bFOUND$/,
139 + qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
140 +# NOTE: match the socket name in clamav.conf to the socket name in this entry
142 # ### http://www.openantivirus.org/
143 # ['OpenAntiVirus ScannerDaemon (OAV)',
144 @@ -1241,13 +1244,18 @@
145 '-sec -nex {}', [0], [100],
146 qr/was infected by virus (.+)/ ],
148 - ['MkS_Vir for Linux (beta)', ['mks32','mks'],
149 - '-s {}/*', [0], [1,2],
150 - qr/--[ \t]*(.+)/ ],
153 - 'mksscan', '-s -q {}', [0], [1..7],
155 + #['MkS_Vir daemon',
156 + # 'mksscan', '-s -q {}', [0], [1..7],
157 + # qr/^... (\S+)/ ],
159 + ['MkS_Vir Daemon for Linux',
160 + 'mkschk','-s {}/*', [0], [1,2],
161 + qr/--[ \t]*(.+)/ ],
163 + # Moved to secondary
164 + #['MkS_Vir for Linux (beta)', ['mks32','mks'],
165 + # '-s {}/*', [0], [1,2],
166 + # qr/--[ \t]*(.+)/ ],
168 ### http://www.nod32.com/
169 ['ESET Software NOD32', 'nod32',
170 @@ -1346,6 +1354,10 @@
171 ['Trend Micro FileScanner', ['/etc/iscan/vscan','vscan'],
172 '-a {}', [0], qr/Found virus/, qr/Found virus (.+) in/ ],
174 + ['MkS_Vir for Linux (beta)', ['mks32','mks'],
175 + '-s {}/*', [0], [1,2],
176 + qr/--[ \t]*(.+)/ ],
178 # Commented out because the name 'sweep' clashes with the Debian package of
179 # the same name. Make sure the correct sweep is found in the path when enabling