DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 5000

diff --git a/test/confs/5000 b/test/confs/5000
index e3328c6a166c1268d26d8c214a8ab1e104d8f75c..2a6aec268e58574ce0d3f4d43947d301bec421f2 100644 (file)
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -2,10 +2,13 @@
 
 .include DIR/aux-var/std_conf_prefix
 
+OPT =
+
 primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
+queue_run_in_order
 
 # ----- Routers -----
 
@@ -14,7 +17,7 @@ begin routers
 localuser:
   driver = accept
   local_parts = userx
-  transport = $h_maildir:appendfile
+  transport = VALUE
 
 
 # ----- Transports -----
@@ -33,7 +36,7 @@ maildir_tagged_appendfile:
   directory = DIR/test-mail
   envelope_to_add
   maildir_format
-  maildir_tag = ${expand:$h_tag:}
+  maildir_tag = OPT
   message_prefix =
   quota = 20K
   quota_size_regex = S=(\d+)$
@@ -45,7 +48,7 @@ maildir_taggedX_appendfile:
   directory = DIR/test-mail
   envelope_to_add
   maildir_format
-  maildir_tag = ${expand:$h_tag:}
+  maildir_tag = OPT
   message_prefix =
   quota = 20K
   quota_size_regex = ,S=(\d+):