---- amavisd-new-20020630/amavis/amavisd.conf.in~ Mon Sep 16 14:57:00 2002
-+++ amavisd-new-20020630/amavis/amavisd.conf.in Mon Sep 16 15:00:11 2002
-@@ -147,11 +147,12 @@
+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 @@
+ # $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')
- $child_timeout=3*60; # abort child if it does not complete each task in n sec
+ # $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)
++
++# 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)
--$daemon_user = 'vscan';
+ # 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_user = 'vscan';
- #$daemon_user = 'sweep';
--$daemon_group = 'sweep';
--# $pid_file = '/var/run/amavisd.pid';
--$pid_file = '/var/amavis/amavisd.pid';
-+$daemon_group = 'nobody';
-+#$daemon_group = 'sweep';
-+$pid_file = '/var/run/amavisd.pid';
++$daemon_group = 'amavis';
+ # Runtime working directory (cwd), and a place where
+ # temporary directories for unpacking mail are created.
+@@ -141,7 +146,8 @@
+ # and see further down what these two lookup lists really mean.
#
- # Part III - Virus stuff
-@@ -351,7 +352,7 @@
- #@inet_acl = qw( 127.0.0.1 ); # allow SMTP access only from localhost
-
- # when MTA (one or more) is on a different host, use the following
--@inet_acl = qw(127/8 193.2.4.243 193.2.4.66);
-+@inet_acl = qw(127/8);
- $inet_socket_bind = undef; # bind to all IP interfaces
- # (and make sure you set $relayhost/$relayhost_is_client accordingly)
+ # @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
++
#
+ # 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')
+
+ # Log file (if not using syslog)
+-$LOGFILE = "$MYHOME/amavis.log"; # (defaults to empty, no log)
++# $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 @@
+ # 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.
+
+ # Notify virus sender?
+-#$warnvirussender = 1; # (defaults to false (undef))
++$warnvirussender = 1; # (defaults to false (undef))
+
+ # Notify spam sender?
+-#$warnspamsender = 1; # (defaults to false (undef))
++$warnspamsender = 1; # (defaults to false (undef))
+
+ # Notify sender of banned files?
+-#$warnbannedsender = 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))
+
+ # Notify virus (or banned files) RECIPIENT?
+ # (not very useful, but some policies demand it)
+-#$warnvirusrecip = 1; # (defaults to false (undef))
+-#$warnbannedrecip = 1; # (defaults to false (undef))
++$warnvirusrecip = 1; # (defaults to false (undef))
++$warnbannedrecip = 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 @@
+ # or a directory (no trailing slash)
+ # (the default value is undef, meaning no quarantine)
+ #
+-$QUARANTINEDIR = '/var/virusmails';
++# $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 @@
+ # ['Sophos SAVI', \&sophos_savi ],
+
+ # ### http://clamav.elektrapro.com/
+-# ['Clam Antivirus-clamd',
+-# \&ask_daemon, ["CONTSCAN {}\n", '/var/amavis/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
++ ['Clam Antivirus-clamd',
++ \&ask_daemon, ["CONTSCAN {}\n", '/var/lib/clamav/clamd.socket'],
++ qr/\bOK$/, qr/\bFOUND$/,
++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
++
++# 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 (.+)/ ],
+
+- ['MkS_Vir for Linux (beta)', ['mks32','mks'],
+- '-s {}/*', [0], [1,2],
+- qr/--[ \t]*(.+)/ ],
++# Moved to secondary scanner
++# ['MkS_Vir for Linux (beta)', ['mks32','mks'],
++# '-s {}/*', [0], [1,2],
++# qr/--[ \t]*(.+)/ ],
+
+ ['MkS_Vir daemon',
+ 'mksscan', '-s -q {}', [0], [1..7],
+@@ -1400,6 +1408,10 @@
+ # # sub {$ENV{SAV_IDE}='/usr/local/sav'},
+ # ],
+
++ ['MkS_Vir for Linux (beta)', ['mks32','mks'],
++ '-s {}/*', [0], [1,2],
++ qr/--[ \t]*(.+)/ ],
++
+ );
+
+
projects / packages / amavisd-new.git / blobdiff