diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-05-25 19:00:16 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-05-25 19:00:16 +0000 |
| commit | bb5d674c5ac29e8a6e24419bfa5c939c538c809d (patch) | |
| tree | 6413573431fdfc85913f7bf4e84c0e9733b65d90 /postfix | |
| parent | ebb8f19230428cab4a765fe2b07f74b3233ec29b (diff) | |
Tighten DKIMproxy use.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index bee6107..e02b89e 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,7 +3,7 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002-2007 Jonas Smedegaard <dr@jones.dk> # -# $Id: postfix.sh,v 1.75 2008-05-25 18:35:31 jonas Exp $ +# $Id: postfix.sh,v 1.76 2008-05-25 19:00:16 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -58,11 +58,18 @@ else echo >&2 "WARNING: Encryption requires SSL certificate at /etc/ssl/certs/postfix.pem." fi +amavis= +if [ -x /usr/sbin/amavisd ] || [ -x /usr/sbin/amavisd-new ]; then + amavis=1 +else + echo >&2 "WARNING: Avoiding AMaViS setup: not installed." +fi + dkimproxy= -if [ -x /usr/bin/dkimsign ]; then +if [ "1" = "$amavis" ] && [ -x /usr/bin/dkimsign ] && grep -q :10024 /etc/init.d/dkimproxy; then dkimproxy=1 else - echo >&2 "WARNING: Avoiding DKIMproxy setup: not installed or fully configured." + echo >&2 "WARNING: Avoiding/disabling DKIMproxy setup: not installed or fully configured." fi catfilefromownrealm() { @@ -256,7 +263,7 @@ else echo >&2 'WARNING: TLS not activated due to missing requirements...' fi -if [ -x /usr/sbin/amavisd ] || [ -x /usr/sbin/amavisd-new ]; then +if [ -n "$amavis" ]; then $postconf -c "$tempdir" -e 'max_use = 10' # Avoid too much reuse cat $tempdir/master.cf | egrep -q "^smtp-amavis$sp" || \ cat >> $tempdir/master.cf << EOF |