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

diff --git a/templates/40-carnet b/templates/40-carnet
index a3711ab..705ff2f 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
@@ -60,7 +62,7 @@ push @av_scanners, (
 # ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
 # ['Sophos SAVI', \&sophos_savi ],
 
-)
+);
 
 # Always have an AV fallback
 #
@@ -69,6 +71,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