diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2007-07-12 18:58:02 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2007-07-12 18:58:02 +0000 |
| commit | f4529179110ab3851452a2076ea97a4492369c4a (patch) | |
| tree | 9929af8477f3a3291b618176068baa5ab480dffd /postfix | |
| parent | ff6a372da3699264ebdc13587cae036c5b21450e (diff) | |
Drop pftls flag (relevant only for pre-2.2 postfix versions).
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 5fcd85b..71f8982 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.46 2007-07-12 18:55:28 jonas Exp $ +# $Id: postfix.sh,v 1.47 2007-07-12 18:58:02 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -24,14 +24,6 @@ if ! $postconf -d mail_version | grep -q '= 2\.2'; then echo "ERROR: Bad postfix version - this script is known to work only for postfix 2.2" exit 1 fi -pftls= -if [ -x /usr/lib/postfix/tlsmgr ]; then - pftls=1 -else - echo "WARNING: Not enabling encryption: TLS-patched postfix required." - echo " (on Debian: install the package postfix-tls)" -fi -# FIXME: We really want to check for at least 2.1.1 but that's tricky... postgrey= if [ -x /usr/sbin/postgrey ]; then # FIXME: Use this somehow, and only warn below @@ -121,7 +113,7 @@ $postconf -e "unverified_sender_reject_code = 550" # TLS breaks postfix if no SASL modules available (and doesn't make sense either) # (change the test if using some other modules and avoid the plain ones) -if [ -n "$pftls" ] && [ -n "$sasl2" ] && [ -f /etc/ssl/certs/postfix.pem ]; then +if [ -n "$sasl2" ] && [ -f /etc/ssl/certs/postfix.pem ]; then mkdir -p "$sasldir" echo 'mech_list: plain login' > "$sasldir/smtpd.conf" echo 'minimum_layer: 0' >> "$sasldir/smtpd.conf" |