Priprema za bullseye, ne brišemo se iz prerm

[amavisd-cn.git] / templates / 40-carnet

diff --git a/templates/40-carnet b/templates/40-carnet
index c9ca70e..b1bacca 100644 (file)
--- a/templates/40-carnet
+++ b/templates/40-carnet
@@ -22,7 +22,7 @@ push @local_domains_acl, ( "$mydomain", ".$mydomain" );
 $mailfrom_notify_admin     = "virusalert\@$mydomain";
 $mailfrom_notify_recip     = "virusalert\@$mydomain";
 $mailfrom_notify_spamadmin = "spamalert\@$mydomain";
-unset $virus_admin;
+undef $virus_admin;
 # Add a line like this (but uncommented) in 50-user if you want it.
 #$virus_admin               = "postmaster\@$mydomain";
 
@@ -35,6 +35,16 @@ unset $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
 #
@@ -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}],
 
 );