Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 5204

diff --git a/test/confs/5204 b/test/confs/5204
index a134270a64a3d2ff92ae2402242352b02d3f7247..a6812213bc5dc07a95c61dc106ae33e26eba3a65 100644 (file)
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -1,16 +1,14 @@
 # Exim test configuration 5204
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+COMMAND_USER=EXIMUSER
+
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+acl_smtp_rcpt = accept verify = recipient
 domainlist local_domains = test.ex
 
 # ----- Routers -----
@@ -27,7 +25,7 @@ q:
   caseful_local_part
   command = /bin/echo \
     "${if match{$local_part}{^\"([^\"]*)\"(.*)\\$}{$1$2}{$local_part}}"
-  command_user = EXIMUSER
+  command_user = COMMAND_USER
   domains = ! +local_domains
   no_more
   transport = smtp
@@ -53,9 +51,11 @@ begin transports
 
 smtp:
   driver = smtp
+  hosts_try_fastopen = :
 
 other_smtp:
   driver = smtp
+  hosts_try_fastopen = :
 
 null:
   driver = appendfile
@@ -64,7 +64,7 @@ null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER