Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / confs / 0230

diff --git a/test/confs/0230 b/test/confs/0230
index 7e0480b2299caee5fbba66dfb8d8ccdc36400893..41bfa869759e694d4c697bb82b84a46776a9de8e 100644 (file)
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_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
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -19,7 +13,7 @@ acl_smtp_rcpt = check_recipient
 log_selector =  \
               +incoming_port \
               +incoming_interface \
-              +smtp_connection
+              +smtp_connection +connection_id
 queue_only
 queue_run_in_order
 
@@ -38,7 +32,7 @@ check_recipient:
 
 begin routers
 
-.ifdef RT
+.ifdef OPT
 to_server:
   driver = manualroute
   transport = remote
@@ -64,12 +58,14 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = Port: $sender_host_port
   user = CALLER
 
 remote:
   driver = smtp
   port = PORT_D
+  hosts_try_fastopen = :
 
 # ----- Retry -----