1 --- amavisd-new-2.4.5/amavisd.conf-sample.orig 2007-01-30 23:12:24.000000000 +0000
2 +++ amavisd-new-2.4.5/amavisd.conf-sample 2007-03-04 00:19:16.457106000 +0000
4 # $MYHOME serves as a quick default for some other configuration settings.
5 # More refined control is available with each individual setting further down.
6 # $MYHOME is not used directly by the program. No trailing slash!
7 -#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis'), -H
8 +$MYHOME = '/var/spool/amavis'; # (default is '/var/amavis'), -H
10 # $mydomain serves as a quick default for some other configuration settings.
11 # More refined control is available with each individual setting further down.
14 # Set the user and group to which the daemon will change if started as root
15 # (otherwise just keeps the UID unchanged, and these settings have no effect):
16 -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
17 -$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
18 +$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
19 +$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
21 # Runtime working directory (cwd), and a place where
22 # temporary directories for unpacking mail are created.
23 # (no trailing slash, may be a scratch file system)
24 -$TEMPBASE = $MYHOME; # (must be set if other config vars use is), -T
25 +$TEMPBASE = "$MYHOME/runtime"; # (must be set if other config vars use is), -T
26 #$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean?
28 -#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
29 +$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
31 # $helpers_home sets environment variable HOME, and is passed as option
32 # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
34 # Run the daemon in the specified chroot jail if nonempty:
35 #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot), -R
37 -#$pid_file = "$MYHOME/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
38 -#$lock_file = "$MYHOME/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
39 +$pid_file = "/var/run/amavisd/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
40 +$lock_file = "/var/run/amavisd/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
42 # set environment variables if you want (no defaults):
43 $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
45 #$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail
46 #$notify_method = $forward_method; # where to submit notifications
48 +#@auth_mech_avail = ('PLAIN','LOGIN'); # empty list disables incoming AUTH
50 #$os_fingerprint_method = 'p0f:127.0.0.1:2345'; # query p0f-analyzer.pl
52 # To make it possible for several hosts to share one content checking daemon,
54 # and see further down what these two lookup lists really mean.
56 # @bypass_virus_checks_maps = (1); # controls running of anti-virus code
57 -# @bypass_spam_checks_maps = (1); # controls running of anti-spam code
58 +@bypass_spam_checks_maps = (1); # controls running of anti-spam code
59 # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
61 # Any setting can be changed with a new assignment, so make sure
63 # AMAVIS-CLIENT PROTOCOL INPUT SETTINGS (e.g. with amavisd-release, or
64 # sendmail milter through helper clients like amavis-milter.c and amavis.c)
65 # option(s) -p overrides $inet_socket_port and $unix_socketname
66 -$unix_socketname = "$MYHOME/amavisd.sock"; # amavis helper protocol socket
67 -#$unix_socketname = undef; # disable listening on a unix socket
68 +#$unix_socketname = "/var/run/amavisd/amavisd.sock"; # amavis helper protocol socket
69 +$unix_socketname = undef; # disable listening on a unix socket
70 # (default is undef, i.e. disabled)
71 # (usual setting is $MYHOME/amavisd.sock)
74 # choose from: emerg, alert, crit, err, warning, notice, info, debug
76 # Log file (if not using syslog)
77 -$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
78 +#$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
80 #NOTE: levels are not strictly observed and are somewhat arbitrary
81 # 0: startup/exit/failure messages, viruses detected
85 # 5: more debug details
86 -$log_level = 2; # (defaults to 0), -d
87 +#$log_level = 2; # (defaults to 0), -d
89 # Customizable template for the most interesting log file entry (e.g. with
90 # $log_level=0) (take care to properly quote Perl special characters like '\')
92 # or a directory (no trailing slash)
93 # (the default value is undef, meaning no quarantine)
95 -$QUARANTINEDIR = '/var/virusmails'; # -Q
96 +#$QUARANTINEDIR = '/var/virusmails'; # -Q
97 +$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q
99 #$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine
101 @@ -1900,15 +1903,15 @@
102 # ['Sophos SAVI', \&sophos_savi ],
104 # ### http://www.clamav.net/
106 -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
107 -# qr/\bOK$/, qr/\bFOUND$/,
108 -# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
109 -# # NOTE: run clamd under the same user as amavisd, or run it under its own
110 -# # uid such as clamav, add user clamav to the amavis group, and then add
111 -# # AllowSupplementaryGroups to clamd.conf;
112 -# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
113 -# # this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
115 + \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"],
116 + qr/\bOK$/, qr/\bFOUND$/,
117 + qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
118 +# NOTE: run clamd under the same user as amavisd, or run it under its own
119 +# uid such as clamav, add user clamav to the amavis group, and then add
120 +# AllowSupplementaryGroups to clamd.conf;
121 +# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
122 +# this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
124 # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
125 # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],
126 @@ -2070,10 +2073,11 @@
127 # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
128 # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
130 - ### http://mks.com.pl/english.html
131 - ['MkS_Vir for Linux (beta)', ['mks32','mks'],
132 - '-s {}/*', [0], [1,2],
133 - qr/--[ \t]*(.+)/ ],
134 +# Moved to secondary scanner
135 +# ### http://mks.com.pl/english.html
136 +# ['MkS_Vir for Linux (beta)', ['mks32','mks'],
137 +# '-s {}/*', [0], [1,2],
138 +# qr/--[ \t]*(.+)/ ],
140 ### http://mks.com.pl/english.html
141 ['MkS_Vir daemon', 'mksscan',
142 @@ -2298,6 +2302,10 @@
144 # # other options to consider: -mime -oe -idedir=/usr/local/sav
146 + ['MkS_Vir for Linux (beta)', ['mks32','mks'],
147 + '-s {}/*', [0], [1,2],
148 + qr/--[ \t]*(.+)/ ],
150 # always succeeds (uncomment to consider mail clean if all other scanners fail)
151 # ['always-clean', sub {0}],