DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0243

diff --git a/test/confs/0243 b/test/confs/0243
index 5692765ed78563e42369853866de510f7d02c78e..339312863a17ae1c405c9f6a6f4e3e1c94ad93eb 100644 (file)
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -1,14 +1,8 @@
 # Exim test configuration 0243
 
 # Exim test configuration 0243
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -66,6 +60,7 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 address_file:
   user = CALLER
 
 address_file:


@@ -77,7 +72,7 @@ address_pipe:
 
 stuur_auto_antwoord:
   driver = autoreply
 
 stuur_auto_antwoord:
   driver = autoreply

-  file = DIR/aux-fixed/TESTNUM.antwoord-${local_part}
+  file = ${lookup {TESTNUM.antwoord-$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}

   file_expand
   from = "${lookup{$local_part} lsearch \
            {DIR/aux-fixed/TESTNUM.beantwoorders} {$value}}"
   file_expand
   from = "${lookup{$local_part} lsearch \
            {DIR/aux-fixed/TESTNUM.beantwoorders} {$value}}"