X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=templates%2F40-carnet;h=f93356efc9fd1698ee0aecb1955e5617fdf35498;hb=e54638abaf26132aa5d03083db0735a674660216;hp=b14efddd5e048dd793415dea3315fc28ca099a0f;hpb=a63d69efb291dbbf593e649b9178d509b239b4c5;p=amavisd-cn.git

diff --git a/templates/40-carnet b/templates/40-carnet
index b14efdd..f93356e 100644
--- a/templates/40-carnet
+++ b/templates/40-carnet
@@ -22,7 +22,8 @@ push @local_domains_acl, ( "$mydomain", ".$mydomain" );
 $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
@@ -34,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
 #