From 3d46b598972fcf13f94a8053a71dedb58470b7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xe=CC=81fir=20Destiny?= Date: Sat, 15 Oct 2016 11:44:35 +0200 Subject: [PATCH] drop file requirements for courier, fix relay_from_domains, fix ehlo junk, fix mailname, fix android sync with courier (because dhparams) --- exim4/exim4.conf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/exim4/exim4.conf b/exim4/exim4.conf index 0f946ae..e3a27ea 100644 --- a/exim4/exim4.conf +++ b/exim4/exim4.conf @@ -1,11 +1,11 @@ #--MACROS SMTP_PORT = 25 : 465 : 587 -LOCAL_INTERFACES = <; ::0 ; 0.0.0.0 +LOCAL_INTERFACES = <; 0.0.0.0 ; ::0 CONFDIR = /etc/exim4 LOCAL_DOMAINS = @:localhost:dsearch;/etc/exim4/domains -ETC_MAILNAME = lsearch;/etc/mailname +ETC_MAILNAME = LOCAL_DELIVERY = mail_spool CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%%!/|`#&?] CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%%!`#&?] : ^.*/\\.\\./ @@ -33,10 +33,11 @@ ACL_SMTP_DATA = acl_check_data #--CONFIGURATION -hostlist relay_from_hosts = 127.0.0.1 : ::1 +hostlist relay_from_hosts = <; 127.0.0.1 ; ::1 CHECK_RCPT_VERIFY_SENDER = 1 keep_environment = +helo_accept_junk_hosts = * daemon_smtp_ports = SMTP_PORT local_interfaces = LOCAL_INTERFACES @@ -127,6 +128,11 @@ acl_check_rcpt: control = submission/sender_retain control = dkim_disable_verify + accept + hosts = +relay_from_hosts + control = submission/sender_retain + control = dkim_disable_verify + require message = relay not permitted domains = +local_domains