X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=templates%2F40-carnet;h=d4fe258b780e0f71327d44ce9ff3c5d20e904956;hb=e63942021f4f155d8d50769276a3524c6de96bca;hp=1d3369bdba99484a7f5127f9ee4bb3a6e0122835;hpb=9881eb03821c641460350eee4ed7aa0350e5c6ca;p=amavisd-cn.git

diff --git a/templates/40-carnet b/templates/40-carnet
index 1d3369b..d4fe258 100644
--- a/templates/40-carnet
+++ b/templates/40-carnet
@@ -9,10 +9,11 @@ use strict;
 ## Do not edit this file, put your changes in 50-user instead!
 ##
 
-# override $mydomain from 05-domain_id and 20-debian_defaults
+# override $mydomain value from 05-domain_id and 20-debian_defaults
+# but keep local_domains we got there
 #
 $mydomain = '_CN_DOMAIN_';
-@local_domains_acl = ( "$mydomain", ".$mydomain" );
+push @local_domains_acl, ( "$mydomain", ".$mydomain" );
 
 # prettify the return path for notifications a bit in case there's a
 # separate person handling these, ie. if the user customizes
@@ -21,7 +22,8 @@ $mydomain = '_CN_DOMAIN_';
 $mailfrom_notify_admin     = "virusalert\@$mydomain";
 $mailfrom_notify_recip     = "virusalert\@$mydomain";
 $mailfrom_notify_spamadmin = "spamalert\@$mydomain";
-# Keep the default for now
+undef $virus_admin;
+# Add a line like this (but uncommented) in 50-user if you want it.
 #$virus_admin               = "postmaster\@$mydomain";
 
 # Keep the default for now
@@ -33,6 +35,16 @@ $mailfrom_notify_spamadmin = "spamalert\@$mydomain";
 $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
 #
@@ -58,17 +70,29 @@ $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 ],
 
-)
+);
 
 # Always have an AV fallback
 #
-push @av_scanners_backup = (
+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}],
 
-)
+);
 
 1;  # insure a defined return