projects
/
amavisd-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r16: - revert clamav dependency back to clamav-cn, it does
[amavisd-cn.git]
/
templates
/
40-carnet
diff --git
a/templates/40-carnet
b/templates/40-carnet
index
1d3369b
..
b14efdd
100644
(file)
--- 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!
##
## 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_';
#
$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
# prettify the return path for notifications a bit in case there's a
# separate person handling these, ie. if the user customizes
@@
-60,15
+61,15
@@
push @av_scanners, (
# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
# ['Sophos SAVI', \&sophos_savi ],
# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
# ['Sophos SAVI', \&sophos_savi ],
-)
+);
# Always have an AV fallback
#
# Always have an AV fallback
#
-push @av_scanners_backup = (
+push @av_scanners_backup, (
# always succeeds (uncomment to consider mail clean if all other scanners fail)
['always-clean', sub {0}],
# always succeeds (uncomment to consider mail clean if all other scanners fail)
['always-clean', sub {0}],
-)
+);
1; # insure a defined return
1; # insure a defined return