From a63d69efb291dbbf593e649b9178d509b239b4c5 Mon Sep 17 00:00:00 2001 From: Zoran Dzelajlija Date: Fri, 19 Oct 2007 00:43:27 +0000 Subject: [PATCH] r16: - revert clamav dependency back to clamav-cn, it does useradd and AllowSupplementaryGroups - keep Debian's local_domain_acls entries... /etc/mailname could be sane --- debian/control | 3 ++- templates/40-carnet | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 1fe430d..62c9f42 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,9 @@ Standards-Version: 3.6.1 Package: amavisd-cn Architecture: all Provides: amavisd-new-cn -Depends: amavisd-new (>= 1:2.4.2-6.1), postfix, clamav-cn (>= 2:0.91.2-1), spamassassin (>= 3.1.7-2), debianutils, carnet-tools-cn (>= 2.7), procps +Depends: amavisd-new (>= 1:2.4.2-6.1), postfix, clamav-cn (>= 2:0.91.2), spamassassin (>= 3.1.7-2), debianutils, carnet-tools-cn (>= 2.7), procps Pre-Depends: amavisd-new +Recommends: postfix-cn, spamassassin-cn Suggests: sophos-srce, libsavi-perl Conflicts: libsavi-perl (<< 0.15), bunch-perl-modules-cn, sweep-cn Description: Easy setup for a postfix/amavisd-new/clamav/spamassassin configuration diff --git a/templates/40-carnet b/templates/40-carnet index 2b9f527..b14efdd 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 -- 1.7.10.4