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

diff --git a/templates/40-carnet b/templates/40-carnet
index a3711ab..f93356e 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
 #
@@ -60,7 +72,7 @@ push @av_scanners, (
 # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
 # ['Sophos SAVI', \&sophos_savi ],
 
-)
+);
 
 # Always have an AV fallback
 #
@@ -69,6 +81,6 @@ push @av_scanners_backup, (
 # always succeeds (uncomment to consider mail clean if all other scanners fail)
 ['always-clean', sub {0}],
 
-)
+);
 
 1;  # insure a defined return