| @@ -0,0 +1,65 @@
+--- amavisd.conf.orig 2008-07-10 06:50:12.000000000 +0200
++++ amavisd.conf 2008-07-10 07:07:03.000000000 +0200
+@@ -94,9 +94,9 @@
+ auth_required_release => 0, # do not require secret_id for amavisd-release
+ };
+
+-$sa_tag_level_deflt = 2.0; # add spam info headers if at, or above that level
+-$sa_tag2_level_deflt = 6.2; # add 'spam detected' headers at that level
+-$sa_kill_level_deflt = 6.9; # triggers spam evasive actions (e.g. blocks mail)
++$sa_tag_level_deflt = undef; # add spam info headers if at, or above that level
++$sa_tag2_level_deflt = 5.0; # add 'spam detected' headers at that level
++$sa_kill_level_deflt = 99; # triggers spam evasive actions (e.g. blocks mail)
+ $sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent
+ $sa_crediblefrom_dsn_cutoff_level = 18; # likewise, but for a likely valid From
+ # $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off
+@@ -149,16 +149,16 @@
+
+ # OTHER MORE COMMON SETTINGS (defaults may suffice):
+
+-# $myhostname = 'host.example.com'; # must be a fully-qualified domain name!
++$myhostname = 'host.example.com'; # must be a fully-qualified domain name!
+
+-# $notify_method = 'smtp:[127.0.0.1]:10025';
+-# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
++$notify_method = 'smtp:127.10.10.10:10025';
++$forward_method = 'smtp:127.10.10.10:10025'; # set to undef with milter!
+
+-# $final_virus_destiny = D_DISCARD;
+-# $final_banned_destiny = D_BOUNCE;
+-# $final_spam_destiny = D_BOUNCE;
+-# $final_bad_header_destiny = D_PASS;
+-# $bad_header_quarantine_method = undef;
++$final_virus_destiny = D_DISCARD;
++$final_banned_destiny = D_BOUNCE;
++$final_spam_destiny = D_PASS;
++$final_bad_header_destiny = D_PASS;
++$bad_header_quarantine_method = undef;
+
+ # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
+
+@@ -360,15 +360,15 @@
+ # ['Sophos SAVI', \&sophos_savi ],
+
+ # ### 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, or run it under its own
+-# # uid such as clamav, add user clamav to the amavis group, and then add
+-# # AllowSupplementaryGroups to clamd.conf;
+-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+-# # this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
++['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, or run it under its own
++# uid such as clamav, add user clamav to the amavis group, and then add
++# AllowSupplementaryGroups to clamd.conf;
++# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
++# this entry; when running chrooted one may prefer socket "$MYHOME/clamd".
+
+ # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
+ # # note that Mail::ClamAV requires perl to be build with threading!
|
