summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2020-10-23 11:44:27 +0200
committerJonas Smedegaard <dr@jones.dk>2020-10-23 11:44:27 +0200
commitf9a2097bb2b880145d76f8aa4bbfbe207cab25cc (patch)
treef56d1f4809d5d7ee681c8b4a750b2c1aeaf485e1
parent95182c75de4cb3015da93c39f610d578989ec770 (diff)
remove obsolete settings smtpd_helo_required maps_rbl_domains (not set their default values)
-rwxr-xr-xpostfix/postfix.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh
index e3c3314..12a442a 100755
--- a/postfix/postfix.sh
+++ b/postfix/postfix.sh
@@ -207,14 +207,7 @@ cp -a -t "$tempdir" "$confdir"/*
# Inspired by D. J. Bernstein: http://cr.yp.to/smtp/greeting.html
_postconf -e smtpd_banner="\$myhostname NO UCE ESMTP \$mail_name (Debian/GNU)"
-# Some badly configured setup use hostname instead of FQDN
-# Disable completely: Effective, but hurts executive type guys using windows servers... :-(
-#if _postconf myhostname | grep -q '\.'; then
-# _postconf -e smtpd_helo_required=yes
-#fi
-_postconf -e smtpd_helo_required=no
_postconf -e "$(getlinesfromfile permit_mx_backup_networks)"
-_postconf -e maps_rbl_domains=
_postconf -e "$(getlinesfromfile smtpd_client_restrictions reject_rhsbl_client)"
_postconf -e "$(getlinesfromfile smtpd_helo_restrictions)"
_postconf -e "$(getlinesfromfile smtpd_sender_restrictions reject_rhsbl_sender ${ENABLE_DKIMPROXY:-sender_access_regex=})"
@@ -445,6 +438,8 @@ else
fi
# obsolete settings
+_postconf -X smtpd_helo_required
+_postconf -X maps_rbl_domains
_postconf -X max_use
_postconf -MX smtp-amavis/unix