X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..9eebb5a0ed51584c18af8b08a27695b806980775:/test/confs/2013 diff --git a/test/confs/2013 b/test/confs/2013 index bddd8ac4a..208e17c41 100644 --- a/test/confs/2013 +++ b/test/confs/2013 @@ -2,20 +2,15 @@ SERVER = -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- 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 @@ -34,6 +29,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}} @@ -59,7 +63,10 @@ local_delivery: send_to_server: driver = smtp allow_localhost + hosts_override hosts = 127.0.0.1 + hosts_noproxy_tls = : port = PORT_D + tls_try_verify_hosts = : # End