summaryrefslogtreecommitdiff
path: root/postfix/postfix.sh
diff options
context:
space:
mode:
Diffstat (limited to 'postfix/postfix.sh')
-rwxr-xr-xpostfix/postfix.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh
index 1b728f9..2b923e0 100755
--- a/postfix/postfix.sh
+++ b/postfix/postfix.sh
@@ -69,7 +69,7 @@ dkimproxy=
if [ "1" = "$amavis" ] && [ -x /usr/bin/dkimsign ]; then
dkimproxy=1
else
- echo >&2 "WARNING: Avoiding/disabling DKIMproxy setup: not installed or fully configured."
+ echo >&2 "WARNING: Avoiding/disabling DKIMproxy setup: not installed."
fi
catfilefromownrealm() {
@@ -222,9 +222,9 @@ if [ -n "$sasl2" ] && [ -n "$sslcert" ]; then
$postconf -c "$tempdir" -e 'smtpd_tls_CApath = /etc/ssl/certs'
$postconf -c "$tempdir" -e 'lmtp_tls_CApath = /etc/ssl/certs'
$postconf -c "$tempdir" -e 'smtpd_tls_key_file = /etc/ssl/private/postfix.pem'
- $postconf -c "$tempdir" -e 'smtpd_tls_session_cache_database = btree:${queue_directory}/smtpd_scache'
+ $postconf -c "$tempdir" -e 'smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache'
$postconf -c "$tempdir" -e 'smtpd_tls_session_cache_timeout = 3600s'
- $postconf -c "$tempdir" -e 'tls_random_exchange_name = ${queue_directory}/prng_exch'
+ $postconf -c "$tempdir" -e 'tls_random_exchange_name = ${data_directory}/prng_exch'
$postconf -c "$tempdir" -e 'smtpd_tls_auth_only = yes'
$postconf -c "$tempdir" -e 'smtpd_sasl_auth_enable = no' # SASL is enabled explicitly with TLS transport
$postconf -c "$tempdir" -e 'smtpd_sasl_security_options = noanonymous'
@@ -248,7 +248,7 @@ if [ -n "$sasl2" ] && [ -n "$sslcert" ]; then
$postconf -c "$tempdir" -e 'smtp_use_tls = yes'
$postconf -c "$tempdir" -e 'smtp_tls_CApath = /etc/ssl/certs'
$postconf -c "$tempdir" -e 'smtp_tls_note_starttls_offer = no' # Enable to collect info for smtp_tls_per_site option
- $postconf -c "$tempdir" -e 'smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache'
+ $postconf -c "$tempdir" -e 'smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache'
# Accepting client certificates breaks SMTP AUTH on OutLook Express on Mac (Classic)
$postconf -c "$tempdir" -e 'smtpd_tls_ask_ccert = no'
# Force using TLS for peers