drop file requirements for courier, fix relay_from_domains, fix ehlo junk, fix mailname, fix android sync with courier (because dhparams)

This commit is contained in:
Michel Roux 2016-10-15 11:44:35 +02:00
parent a2edde9943
commit 3d46b59897

View File

@ -1,11 +1,11 @@
#--MACROS #--MACROS
SMTP_PORT = 25 : 465 : 587 SMTP_PORT = 25 : 465 : 587
LOCAL_INTERFACES = <; ::0 ; 0.0.0.0 LOCAL_INTERFACES = <; 0.0.0.0 ; ::0
CONFDIR = /etc/exim4 CONFDIR = /etc/exim4
LOCAL_DOMAINS = @:localhost:dsearch;/etc/exim4/domains LOCAL_DOMAINS = @:localhost:dsearch;/etc/exim4/domains
ETC_MAILNAME = lsearch;/etc/mailname ETC_MAILNAME =
LOCAL_DELIVERY = mail_spool LOCAL_DELIVERY = mail_spool
CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%%!/|`#&?] CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%%!/|`#&?]
CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%%!`#&?] : ^.*/\\.\\./ CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%%!`#&?] : ^.*/\\.\\./
@ -33,10 +33,11 @@ ACL_SMTP_DATA = acl_check_data
#--CONFIGURATION #--CONFIGURATION
hostlist relay_from_hosts = 127.0.0.1 : ::1 hostlist relay_from_hosts = <; 127.0.0.1 ; ::1
CHECK_RCPT_VERIFY_SENDER = 1 CHECK_RCPT_VERIFY_SENDER = 1
keep_environment = keep_environment =
helo_accept_junk_hosts = *
daemon_smtp_ports = SMTP_PORT daemon_smtp_ports = SMTP_PORT
local_interfaces = LOCAL_INTERFACES local_interfaces = LOCAL_INTERFACES
@ -127,6 +128,11 @@ acl_check_rcpt:
control = submission/sender_retain control = submission/sender_retain
control = dkim_disable_verify control = dkim_disable_verify
accept
hosts = +relay_from_hosts
control = submission/sender_retain
control = dkim_disable_verify
require require
message = relay not permitted message = relay not permitted
domains = +local_domains domains = +local_domains