-diff -urN amavisd-new-20030616.org/amavisd.conf amavisd-new-20030616/amavisd.conf
---- amavisd-new-20030616.org/amavisd.conf Mon Dec 1 21:43:19 2003
-+++ amavisd-new-20030616/amavisd.conf Mon Dec 1 21:44:53 2003
-@@ -51,17 +51,22 @@
+--- amavisd-new-2.2.1/amavisd.conf-sample 2004-12-23 01:38:23.000000000 +0000
++++ amavisd-new-2.2.1.new/amavisd.conf-sample 2004-12-23 20:18:27.372867424 +0000
+@@ -62,27 +62,31 @@
# $MYHOME serves as a quick default for some other configuration settings.
# More refined control is available with each individual setting further down.
# $MYHOME is not used directly by the program. No trailing slash!
-#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
-+$MYHOME = '/var/spool/amavis/runtime'; # (default is '/var/amavis')
++$MYHOME = '/var/spool/amavis'; # (default is '/var/amavis')
# $mydomain serves as a quick default for some other configuration settings.
# More refined control is available with each individual setting further down.
# $mydomain is never used directly by the program.
-$mydomain = 'example.com'; # (no useful default)
-+# $mydomain = 'example.com'; # (no useful default)
++#$mydomain = 'example.com'; # (no useful default)
+
+# This seems to be prefixed to host's domain name.
+# You may get mail rejects of virus information as send from not
+# existing host ( virusalert@localhost.whatever.your.domain.is )
+$mydomain = 'mail.whatever.your.domain.is'; # (no useful default)
+ # $myhostname = 'host.example.com'; # fqdn of this host, default by uname(3)
+
# Set the user and group to which the daemon will change if started as root
# (otherwise just keeps the UID unchanged, and these settings have no effect):
--$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
--$daemon_group = 'sweep'; # (no default; customary: vscan or amavis)
-+$daemon_user = 'amavis';
-+$daemon_group = 'amavis';
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis or sweep)
++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis)
++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis or sweep)
# Runtime working directory (cwd), and a place where
# temporary directories for unpacking mail are created.
-@@ -141,7 +146,8 @@
+ # (no trailing slash, may be a scratch file system)
+-$TEMPBASE = $MYHOME; # (must be set if other config vars use is)
+-#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean?
++$TEMPBASE = "$MYHOME/runtime"; # (must be set if other config vars use is)
+
+-#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db"
++$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db"
+
+ # $helpers_home sets environment variable HOME, and is passed as option
+ # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
+@@ -92,8 +96,8 @@
+ # Run the daemon in the specified chroot jail if nonempty:
+ #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot)
+
+-#$pid_file = "$MYHOME/amavisd.pid"; # (default is "$MYHOME/amavisd.pid")
+-#$lock_file = "$MYHOME/amavisd.lock"; # (default is "$MYHOME/amavisd.lock")
++$pid_file = "/var/run/amavisd/amavisd.pid"; # (default is "$MYHOME/amavisd.pid")
++$lock_file = "/var/run/amavisd/amavisd.lock"; # (default is "$MYHOME/amavisd.lock")
+
+ # set environment variables if you want (no defaults):
+ $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
+@@ -111,6 +115,9 @@
+ #$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail
+ #$notify_method = $forward_method; # where to submit notifications
+
++# @auth_mech_avail = ('PLAIN','LOGIN'); # empty list disables incoming AUTH
++
++
+ # To make it possible for several hosts to share one content checking daemon,
+ # the IP address and/or the port number in $forward_method and $notify_method
+ # may be spacified as an asterisk. An asterisk in the colon-separated
+@@ -164,7 +171,7 @@
# and see further down what these two lookup lists really mean.
#
- # @bypass_virus_checks_acl = qw( . ); # uncomment to DISABLE anti-virus code
--# @bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code
-+@bypass_spam_checks_acl = qw( . ); # uncomment to DISABLE anti-spam code
-+
+ # @bypass_virus_checks_maps = (1); # uncomment to DISABLE anti-virus code
+-# @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code
++@bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code
#
# Any setting can be changed with a new assignment, so make sure
# you do not unintentionally override these settings further down!
-@@ -177,7 +183,7 @@
- # directly, or read from a file, one domain per line; comments and empty lines
- # are ignored, a dot before a domain name implies its subdomains:
- #
--#read_hash(\%local_domains, '/var/amavis/local_domains');
-+#read_hash(\%local_domains, '/var/spool/amavis/local_domains'); # PLD path
-
- #or alternatively(B), using a list of regular expressions:
- # $local_domains_re = new_RE( qr'[@.]example\.com$'i );
-@@ -265,7 +271,7 @@
- #$SYSLOG_LEVEL = 'user.info'; # (defaults to 'mail.info')
+@@ -209,7 +216,7 @@
+ # AMAVIS-CLIENT PROTOCOL INPUT SETTINGS (e.g. with sendmail milter)
+ # (used with amavis helper clients like amavis-milter.c and amavis.c,
+ # NOT needed for Postfix or Exim or dual-sendmail - keep it undefined.
+-$unix_socketname = "$MYHOME/amavisd.sock"; # amavis helper protocol socket
++#$unix_socketname = "/var/run/amavisd/amavisd.sock"; # amavis helper protocol socket
+ #$unix_socketname = undef; # disable listening on a unix socket
+ # (default is undef, i.e. disabled)
+ # (usual setting is $MYHOME/amavisd.sock)
+@@ -279,7 +286,7 @@
+ #$SYSLOG_LEVEL = 'user.info'; # (facility.priority, default 'mail.info')
# Log file (if not using syslog)
-$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
#NOTE: levels are not strictly observed and are somewhat arbitrary
# 0: startup/exit/failure messages, viruses detected
-@@ -274,7 +280,7 @@
+@@ -288,7 +295,8 @@
# 3: server, client
# 4: decompose parts
# 5: more debug details
-$log_level = 2; # (defaults to 0)
+# $log_level = 2; # (defaults to 0)
++
# Customizable template for the most interesting log file entry (e.g. with
# $log_level=0) (take care to properly quote Perl special characters like '\')
-@@ -406,21 +412,21 @@
- # Bounces or rejects produce non-delivery status notification anyway.
+@@ -471,22 +479,22 @@
+ # Bounces or rejects produce non-delivery status notification regardless.
# Notify virus sender?
-#$warnvirussender = 1; # (defaults to false (undef))
+$warnbannedsender = 1; # (defaults to false (undef))
# Notify sender of syntactically invalid header containing non-ASCII characters?
- #$warnbadhsender = 1; # (defaults to false (undef))
+-#$warnbadhsender = 1; # (defaults to false (undef))
++# $warnbadhsender = 1; # (defaults to false (undef))
- # Notify virus (or banned files) RECIPIENT?
+ # Notify virus (or banned files or bad headers) RECIPIENT?
# (not very useful, but some policies demand it)
-#$warnvirusrecip = 1; # (defaults to false (undef))
-#$warnbannedrecip = 1; # (defaults to false (undef))
+-#$warnbadhrecip = 1; # (defaults to false (undef))
+$warnvirusrecip = 1; # (defaults to false (undef))
+$warnbannedrecip = 1; # (defaults to false (undef))
++$warnbadhrecip = 1; # (defaults to false (undef))
# Notify also non-local virus/banned recipients if $warn*recip is true?
# (including those not matching local_domains*)
-@@ -510,7 +516,8 @@
+@@ -587,7 +595,8 @@
# or a directory (no trailing slash)
# (the default value is undef, meaning no quarantine)
#
+# $QUARANTINEDIR = '/var/virusmails';
+$QUARANTINEDIR = '/var/spool/amavis/virusmails';
- #$virus_quarantine_method = "local:virus-%i-%n"; # default
- #$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
-@@ -1166,12 +1173,12 @@
+ #$virus_quarantine_method = 'local:virus-%i-%n'; # default
+ #$spam_quarantine_method = 'local:spam-%b-%i-%n'; # default
+@@ -1600,13 +1609,12 @@
# ['Sophos SAVI', \&sophos_savi ],
- # ### http://clamav.elektrapro.com/
--# ['Clam Antivirus-clamd',
--# \&ask_daemon, ["CONTSCAN {}\n", '/var/amavis/clamd'],
+ # ### http://www.clamav.net/
+-# ['ClamAV-clamd',
+-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
-# qr/\bOK$/, qr/\bFOUND$/,
-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
--# # NOTE: run clamd under the same user as amavisd,
--# # match the socket name in clamav.conf to the socket name in this entry
+-# # NOTE: the easiest is to run clamd under the same user as amavisd; match the
+-# # socket name (LocalSocket) in clamav.conf to the socket name in this entry
+-# # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ ['Clam Antivirus-clamd',
+ \&ask_daemon, ["CONTSCAN {}\n", '/var/lib/clamav/clamd.socket'],
+ qr/\bOK$/, qr/\bFOUND$/,
+
+# NOTE: match the socket name in clamav.conf to the socket name in this entry
- # ### http://www.openantivirus.org/
- # ['OpenAntiVirus ScannerDaemon (OAV)',
-@@ -1281,9 +1288,10 @@
- '-sec -nex {}', [0], [100],
- qr/was infected by virus (.+)/ ],
+ # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
+ # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],
+@@ -1740,10 +1748,11 @@
+ # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
+ # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
+- ### http://mks.com.pl/english.html
- ['MkS_Vir for Linux (beta)', ['mks32','mks'],
- '-s {}/*', [0], [1,2],
-- qr/--[ \t]*(.+)/ ],
+- qr/--[ \t]*(.+)/ ],
+# Moved to secondary scanner
++# ### http://mks.com.pl/english.html
+# ['MkS_Vir for Linux (beta)', ['mks32','mks'],
+# '-s {}/*', [0], [1,2],
-+# qr/--[ \t]*(.+)/ ],
++# qr/--[ \t]*(.+)/ ],
- ['MkS_Vir daemon',
- 'mksscan', '-s -q {}', [0], [1..7],
-@@ -1400,6 +1408,10 @@
- # # sub {$ENV{SAV_IDE}='/usr/local/sav'},
+ ### http://mks.com.pl/english.html
+ ['MkS_Vir daemon', 'mksscan',
+@@ -1938,6 +1947,11 @@
# ],
+ # # other options to consider: -mime -oe -idedir=/usr/local/sav
+ ['MkS_Vir for Linux (beta)', ['mks32','mks'],
+ '-s {}/*', [0], [1,2],
+ qr/--[ \t]*(.+)/ ],
+
- );
-
++
+ # always succeeds (uncomment to consider mail clean if all other scanners fail)
+ # ['always-clean', sub {0}],
projects / packages / amavisd-new.git / blobdiff