X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/4fab92fbc2b63bac2d89c1dae69fa1845cb640b7..a76d120aedbb1c19943db1227a14226ce6fdb679:/test/confs/2013 diff --git a/test/confs/2013 b/test/confs/2013 index ebd253691..d81f160de 100644 --- a/test/confs/2013 +++ b/test/confs/2013 @@ -1,6 +1,7 @@ # Exim test configuration 2013 SERVER = +PEX = : .include DIR/aux-var/tls_conf_prefix @@ -10,7 +11,7 @@ primary_hostname = myhost.test.ex acl_smtp_rcpt = accept -log_selector = +tls_peerdn+smtp_connection+incoming_port +log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients queue_only queue_run_in_order @@ -29,6 +30,15 @@ tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} begin routers +.ifdef REQUIRE +cl_override: + driver = manualroute + route_data = HOSTIPV4 + retry_use_local_part + transport = send_to_server + self = send +.endif + client: driver = accept condition = ${if eq {SERVER}{server}{no}{yes}} @@ -47,14 +57,18 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER send_to_server: driver = smtp allow_localhost + hosts_override hosts = 127.0.0.1 port = PORT_D + hosts_try_fastopen = : + hosts_noproxy_tls = PEX + tls_try_verify_hosts = : # End