diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh index a31a2773..fba1cb76 100755 --- a/setup/mail-postfix.sh +++ b/setup/mail-postfix.sh @@ -204,7 +204,7 @@ postconf -e smtpd_sender_restrictions="reject_non_fqdn_sender,reject_unknown_sen RECIPIENT_RESTRICTIONS="permit_sasl_authenticated,permit_mynetworks,reject_rbl_client zen.spamhaus.org,reject_unlisted_recipient" -if [ $GREYLISTING != 1 ]; then +if [ $POSTGREY != 1 ]; then RECIPIENT_RESTRICTIONS="${RECIPIENT_RESTRICTIONS},check_policy_service inet:127.0.0.1:10023" fi diff --git a/setup/start.sh b/setup/start.sh index b84d720c..a3061fe0 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -46,8 +46,8 @@ if [ -z "${HTTP_SSL_PORT:-}" ]; then HTTP_SSL_PORT=$([[ -z "${DEFAULT_HTTP_SSL_PORT:-}" ]] && echo "443" || echo "$DEFAULT_HTTP_SSL_PORT") fi -if [ -z "${GREYLISTING:-}" ]; then - GREYLISTING=$([[ -z "${DEFAULT_GREYLISTING:-}" ]] && echo "1" || echo "$DEFAULT_GREYLISTING") +if [ -z "${POSTGREY:-}" ]; then + POSTGREY=$([[ -z "${DEFAULT_POSTGREY:-}" ]] && echo "1" || echo "$DEFAULT_POSTGREY") fi if [ -z "${POSTSRSD:-}" ]; then @@ -110,7 +110,7 @@ PUBLIC_IPV6=$PUBLIC_IPV6 PRIVATE_IP=$PRIVATE_IP PRIVATE_IPV6=$PRIVATE_IPV6 HTTP_SSL_PORT=$HTTP_SSL_PORT -GREYLISTING=$GREYLISTING +POSTGREY=$POSTGREY POSTSRSD=$POSTSRSD POLICY_SPF=$POLICY_SPF EOF