]>
Commit | Line | Data |
---|---|---|
60e8cb7d | 1 | --- amavisd-new.orig/amavisd.conf-sample 2006-06-27 13:31:44.000000000 +0200 |
2 | +++ amavisd-new/amavisd.conf-sample 2006-08-06 00:22:10.986675750 +0200 | |
3 | @@ -63,7 +63,7 @@ | |
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 | |
9 | ||
10 | # $mydomain serves as a quick default for some other configuration settings. | |
11 | # More refined control is available with each individual setting further down. | |
12 | @@ -74,16 +74,16 @@ | |
13 | ||
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 | |
20 | ||
21 | # Runtime working directory (cwd), and a place where | |
22 | # temporary directories for unpacking mail are created. | |
f2c96aaf | 23 | # (no trailing slash, may be a scratch file system) |
60e8cb7d | 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? | |
f2c96aaf | 27 | |
2183a73b PG |
28 | -#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D |
29 | +$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D | |
f2c96aaf | 30 | |
8f9da28f JR |
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 | |
60e8cb7d | 33 | @@ -93,8 +93,8 @@ |
97a5e95d | 34 | # Run the daemon in the specified chroot jail if nonempty: |
2183a73b | 35 | #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot), -R |
97a5e95d | 36 | |
2183a73b PG |
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 | |
97a5e95d TP |
41 | |
42 | # set environment variables if you want (no defaults): | |
43 | $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory | |
60e8cb7d | 44 | @@ -112,6 +112,8 @@ |
1dd6756d JR |
45 | #$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail |
46 | #$notify_method = $forward_method; # where to submit notifications | |
1dd6756d | 47 | |
2183a73b | 48 | +#@auth_mech_avail = ('PLAIN','LOGIN'); # empty list disables incoming AUTH |
9855952f | 49 | + |
e0c5f1c0 PG |
50 | #$os_fingerprint_method = 'p0f:127.0.0.1:2345'; # query p0f-analyzer.pl |
51 | ||
1dd6756d | 52 | # To make it possible for several hosts to share one content checking daemon, |
60e8cb7d | 53 | @@ -171,7 +173,7 @@ |
e8d05b10 MK |
54 | # and see further down what these two lookup lists really mean. |
55 | # | |
f2c96aaf JR |
56 | # @bypass_virus_checks_maps = (1); # uncomment to DISABLE anti-virus code |
57 | -# @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code | |
58 | +@bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code | |
e8d05b10 MK |
59 | # |
60 | # Any setting can be changed with a new assignment, so make sure | |
61 | # you do not unintentionally override these settings further down! | |
60e8cb7d | 62 | @@ -217,8 +219,8 @@ |
2183a73b PG |
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 | |
97a5e95d | 66 | -$unix_socketname = "$MYHOME/amavisd.sock"; # amavis helper protocol socket |
e0c5f1c0 | 67 | -#$unix_socketname = undef; # disable listening on a unix socket |
97a5e95d | 68 | +#$unix_socketname = "/var/run/amavisd/amavisd.sock"; # amavis helper protocol socket |
e0c5f1c0 | 69 | +$unix_socketname = undef; # disable listening on a unix socket |
97a5e95d TP |
70 | # (default is undef, i.e. disabled) |
71 | # (usual setting is $MYHOME/amavisd.sock) | |
e0c5f1c0 | 72 | |
60e8cb7d | 73 | @@ -301,7 +303,7 @@ |
e0c5f1c0 | 74 | # choose from: emerg, alert, crit, err, warning, notice, info, debug |
4395c06f MK |
75 | |
76 | # Log file (if not using syslog) | |
77 | -$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log) | |
2183a73b | 78 | +#$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log) |
4395c06f MK |
79 | |
80 | #NOTE: levels are not strictly observed and are somewhat arbitrary | |
81 | # 0: startup/exit/failure messages, viruses detected | |
60e8cb7d | 82 | @@ -310,7 +312,7 @@ |
e8d05b10 MK |
83 | # 3: server, client |
84 | # 4: decompose parts | |
85 | # 5: more debug details | |
2183a73b PG |
86 | -$log_level = 2; # (defaults to 0), -d |
87 | +#$log_level = 2; # (defaults to 0), -d | |
e8d05b10 MK |
88 | |
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 '\') | |
60e8cb7d | 91 | @@ -684,7 +686,8 @@ |
eda82b86 | 92 | # or a directory (no trailing slash) |
7f7d88d2 | 93 | # (the default value is undef, meaning no quarantine) |
66ce8ece | 94 | # |
2183a73b PG |
95 | -$QUARANTINEDIR = '/var/virusmails'; # -Q |
96 | +#$QUARANTINEDIR = '/var/virusmails'; # -Q | |
97 | +$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q | |
eda82b86 | 98 | |
e0c5f1c0 PG |
99 | #$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine |
100 | ||
60e8cb7d | 101 | @@ -1806,13 +1809,13 @@ |
e8d05b10 MK |
102 | # ['Sophos SAVI', \&sophos_savi ], |
103 | ||
8ef44a08 | 104 | # ### http://www.clamav.net/ |
f2c96aaf | 105 | -# ['ClamAV-clamd', |
8ef44a08 | 106 | -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], |
e8d05b10 MK |
107 | -# qr/\bOK$/, qr/\bFOUND$/, |
108 | -# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], | |
9855952f SP |
109 | -# # NOTE: the easiest is to run clamd under the same user as amavisd; match the |
110 | -# # socket name (LocalSocket) in clamav.conf to the socket name in this entry | |
8ef44a08 | 111 | -# # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"], |
2183a73b | 112 | + ['ClamAV-clamd', |
e0c5f1c0 PG |
113 | + \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], |
114 | + qr/\bOK$/, qr/\bFOUND$/, | |
115 | + qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], | |
2183a73b PG |
116 | +# NOTE: the easiest is to run clamd under the same user as amavisd; match the |
117 | +# socket name (LocalSocket) in clamav.conf to the socket name in this entry | |
118 | +# When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"], | |
e8d05b10 | 119 | |
4f91afad | 120 | # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) |
121 | # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/], | |
60e8cb7d | 122 | @@ -1969,10 +1972,11 @@ |
2183a73b PG |
123 | # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer |
124 | # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783 | |
e8d05b10 | 125 | |
4f91afad | 126 | - ### http://mks.com.pl/english.html |
2183a73b PG |
127 | - ['MkS_Vir for Linux (beta)', ['mks32','mks'], |
128 | - '-s {}/*', [0], [1,2], | |
129 | - qr/--[ \t]*(.+)/ ], | |
4395c06f | 130 | +# Moved to secondary scanner |
4f91afad | 131 | +# ### http://mks.com.pl/english.html |
2183a73b PG |
132 | +# ['MkS_Vir for Linux (beta)', ['mks32','mks'], |
133 | +# '-s {}/*', [0], [1,2], | |
134 | +# qr/--[ \t]*(.+)/ ], | |
4395c06f | 135 | |
2183a73b PG |
136 | ### http://mks.com.pl/english.html |
137 | ['MkS_Vir daemon', 'mksscan', | |
60e8cb7d | 138 | @@ -2175,6 +2179,10 @@ |
4395c06f | 139 | # ], |
8ef44a08 | 140 | # # other options to consider: -mime -oe -idedir=/usr/local/sav |
4395c06f | 141 | |
e0c5f1c0 PG |
142 | + ['MkS_Vir for Linux (beta)', ['mks32','mks'], |
143 | + '-s {}/*', [0], [1,2], | |
144 | + qr/--[ \t]*(.+)/ ], | |
8ef44a08 | 145 | + |
146 | # always succeeds (uncomment to consider mail clean if all other scanners fail) | |
147 | # ['always-clean', sub {0}], | |
4395c06f | 148 |