DNS: tag res_search() hack by lookup type in debug output; munge ipv6 lines in testsuite

[users/jgh/exim.git] / test / confs / 2013

diff --git a/test/confs/2013 b/test/confs/2013
index 0be2772598c81f4e45f453e4ed7ab827c7bfd4f3..4c9fcd3e8ca221099529f7813afd79e75e44cc21 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -1,21 +1,17 @@
 # Exim test configuration 2013
 
 SERVER =
+PEX = :
+
+.include DIR/aux-var/tls_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-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 +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}}
@@ -59,7 +64,10 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
+  hosts_override
   hosts = 127.0.0.1
+  hosts_noproxy_tls = PEX
   port = PORT_D
+  tls_try_verify_hosts = :
 
 # End