diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-02-28 19:45:45 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-02-28 19:45:45 +0000 |
| commit | 4b5cdbfa8f57d799a063d0c90eaad78403a90cc2 (patch) | |
| tree | d3a6e73efaf2f1dd3552726a944f3f48680035b4 /postfix | |
| parent | d387cf41c6fec25714670d5bd3a8c6badc607636 (diff) | |
Support local .addon for tls_policy and sender_access.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 5f84cb6..88e52ed 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.67 2008-02-28 19:36:09 jonas Exp $ +# $Id: postfix.sh,v 1.68 2008-02-28 19:45:45 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -165,6 +165,7 @@ postmapfiles="$postmapfiles rbl_reply_map" cat /etc/local-COMMON/postfix/maildomains | grep -v yahoo | sort | sed 's/$/ reject_unverified_sender/' > "$tempdir/sender_access" ( catfilefromownrealm maildomains | sort; catallfilesfromotherrealms maildomains | sort ) \ | sed 's/\(.*\)$/postmaster@\1 permit\n\1 reject_unverified_sender/' >> "$tempdir/sender_access" +[ ! -f "$tempdir/sender_access.addon" ] || cat "$tempdir/sender_access.addon" >> "$tempdir/sender_access" postmapfiles="$postmapfiles sender_access" $postconf -c "$tempdir" -e "unverified_sender_reject_code = 550" @@ -229,6 +230,7 @@ if [ -n "$sasl2" ] && [ -n "$sslcert" ]; then $postconf -c "$tempdir" -e 'smtpd_tls_ask_ccert = no' # Force using TLS for peers catallfilesfromotherrealms mailhost | sort | sed 's/^/[/;s/$/]:submission secure/' > "$tempdir/tls_policy" + [ ! -f "$tempdir/tls_policy.addon" ] || cat "$tempdir/tls_policy.addon" >> "$tempdir/tls_policy" postmapfiles="$postmapfiles tls_policy" $postconf -c "$tempdir" -e "smtp_tls_policy_maps = hash:$confdir/tls_policy" else |