X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/328c5688dbe0f4c14418f22350ccd99b3fe8ac71..148d9d517265b06fee1ac15047040e3f1789f280:/test/confs/0906 diff --git a/test/confs/0906 b/test/confs/0906 index 2e8d35a91..031065359 100644 --- a/test/confs/0906 +++ b/test/confs/0906 @@ -10,6 +10,12 @@ gecos_pattern = "" gecos_name = CALLER_NAME chunking_advertise_hosts = * tls_advertise_hosts = ${if eq {SRV}{tls} {*}} +.ifdef _HAVE_PIPE_CONNECT +pipelining_connect_advertise_hosts = +.endif +.ifdef _HAVE_DMARC +dmarc_tld_file = +.endif # ----- Main settings ----- @@ -18,16 +24,30 @@ spool_wireformat = true primary_hostname = testhost.test.ex domainlist local_domains = @ : test.ex -acl_smtp_rcpt = accept +acl_smtp_rcpt = acl_r + +.ifdef _HAVE_DKIM +log_selector = +received_recipients +dkim_verbose +.else log_selector = +received_recipients +.endif + .ifdef _OPT_MAIN_TLS_CERTIFICATE tls_certificate = DIR/aux-fixed/cert1 tls_privatekey = DIR/aux-fixed/cert1 .endif +queue_run_in_order = true + # ----- ACL ----- +begin acl +acl_r: + accept condition = ${if != {$received_port}{PORT_S}} + control = queue_only + accept + # ----- Routers ----- begin routers @@ -54,7 +74,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "X-body-linecount: $body_linecount\n\ X-message-linecount: $message_linecount\n\ X-received-count: $received_count" @@ -65,12 +85,14 @@ remote_smtp: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost remote_smtp_dkim: driver = smtp hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : allow_localhost .ifdef OPT