X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=templates%2F40-carnet;h=d4fe258b780e0f71327d44ce9ff3c5d20e904956;hb=1a6944c221294202ee0b5e89c2d9f4dc6fdbcc5e;hp=705ff2ff15f8b3bfa976d6aedaff07ab8134139a;hpb=9f86cafd99b037bf9ba37fa5eb6d5471593bc5f0;p=amavisd-cn.git

diff --git a/templates/40-carnet b/templates/40-carnet
index 705ff2f..d4fe258 100644
--- a/templates/40-carnet
+++ b/templates/40-carnet
@@ -35,6 +35,16 @@ undef $virus_admin;
 $forward_method = 'smtp:127.0.0.1:10025';  # where to forward checked mail
 $notify_method  = $forward_method;         # where to submit notifications
 
+# Default antivirus checking mode
+#
+@bypass_virus_checks_maps = (
+   \%bypass_virus_checks, \@bypass_virus_checks_acl, \$bypass_virus_checks_re);
+
+# Default SPAM checking mode
+#
+@bypass_spam_checks_maps = (
+   \%bypass_spam_checks, \@bypass_spam_checks_acl, \$bypass_spam_checks_re);
+
 # postfix setup for notifications, for rationale read the comments about
 # LMTP in /usr/share/doc/amavisd-new/README.postfix.gz
 #
@@ -60,7 +70,7 @@ $first_infected_stops_scan = 1;        # default is false, all scanners are call
 push @av_scanners, (
 
 # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
-# ['Sophos SAVI', \&sophos_savi ],
+ ['Sophos SAVI', \&sophos_savi ],
 
 );
 
@@ -68,8 +78,20 @@ push @av_scanners, (
 #
 push @av_scanners_backup, (
 
+# Commented out because the name 'sweep' clashes with Debian and FreeBSD
+# package/port of an audio editor. Make sure the correct 'sweep' is found
+# in the path when enabling.
+#
+# ### http://www.sophos.com/   - backs up Sophie or SAVI-Perl
+ ['Sophos Anti Virus (sweep)', 'sweep',
+   '-nb -f -all -rec -ss -sc -archive -cab -tnef --no-reset-atime {}',
+   [0,2], qr/Virus .*? found/,
+   qr/^>>> Virus(?: fragment)? '?(.*?)'? found/,
+ ],
+ # other options to consider: -mime -oe -idedir=/usr/local/sav
+
 # always succeeds (uncomment to consider mail clean if all other scanners fail)
-['always-clean', sub {0}],
+ ['always-clean', sub {0}],
 
 );