testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 2010

diff --git a/test/confs/2010 b/test/confs/2010
index bda63bb7afe054235a22ce1a69426917da59bd31..dae45a08c88f21ca33042ac4a75cf113ed40c764 100644 (file)
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -1,18 +1,17 @@
 # Exim test configuration 2010
 
 SERVER =
+TIMES =
+HOSTS = 127.0.0.1 : HOSTIPV4
+
+.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 -----
 
+log_selector = +outgoing_port
+
 acl_smtp_rcpt = accept
 
 queue_only
@@ -44,8 +43,17 @@ begin transports
 send_to_server:
   driver = smtp
   allow_localhost
-  hosts = 127.0.0.1 : HOSTIPV4
-  hosts_require_tls = *
+  hosts = HOSTS
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = *
+
+
+# ----- Retry -----
+
+begin retry
+
+* tls_required  TIMES
+* *  F,1d,5m
 
 # End