diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-06-01 18:36:19 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-06-01 18:36:19 +0000 |
| commit | 498e7ab274bb78fa7c91b7622a1d1230cc8f867c (patch) | |
| tree | 11707ee70ccfa5aa5566a0ed8cb601620852df5f | |
| parent | 8d00707187a601ec60f82d9e6c03abb44a7fbb10 (diff) | |
Recognize amavisd-new as alternative to amavisd.
| -rwxr-xr-x | postfix/postfix.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 670beeb..22a3e10 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,7 +3,7 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002-2003 Jonas Smedegaard <dr@jones.dk> # -# $Id: postfix.sh,v 1.16 2003-04-10 04:27:10 jonas Exp $ +# $Id: postfix.sh,v 1.17 2003-06-01 18:36:19 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -106,7 +106,7 @@ else echo 'TLS not activated - check the script for requirements...' fi -if [ -x /usr/sbin/amavisd ]; then +if [ -x /usr/sbin/amavisd -o -x /usr/sbin/amavisd-new ]; then cat $confdir/master.cf | egrep -q "^smtp-amavis$sp" || \ echo 'smtp-amavis unix - - n - 2 smtp -o smtp_data_done_timeout=1200s -o smtp_never_send_ehlo=yes -o disable_dns_lookups=yes' >> $confdir/master.cf cat $confdir/master.cf | egrep -q "^127.0.0.1:10025$sp" || \ |