DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0226

diff --git a/test/confs/0226 b/test/confs/0226
index 9ebdb791757ccec73c30d3247918de332432ce63..e831208399a1906a900c15765470a48bcb06263e 100644 (file)
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -1,11 +1,7 @@
 # Exim test configuration 0226
 
 # Exim test configuration 0226
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -26,10 +22,14 @@ bounces:
 
 notallowed:
   driver = redirect
 
 notallowed:
   driver = redirect

+  domains = no.test.ex

   allow_defer
   caseful_local_part
   allow_defer
   caseful_local_part

-  data = $local_part
-  domains = no.test.ex
+  data = ${extract {$local_part} \
+         { file1=/a/b/c \
+           pipe1=|/p/q/r \
+           file2=DIR/test-mail/file \
+           pipe2=|DIR/aux-fixed/showenv }}

   forbid_file
   forbid_pipe
   retry_use_local_part
   forbid_file
   forbid_pipe
   retry_use_local_part


@@ -38,7 +38,11 @@ allowed:
   driver = redirect
   allow_defer
   caseful_local_part
   driver = redirect
   allow_defer
   caseful_local_part

-  data = $local_part
+  data = ${extract {$local_part} \
+         { file1=/a/b/c \
+           pipe1=|/p/q/r \
+           file2=DIR/test-mail/file \
+           pipe2=|DIR/aux-fixed/showenv }}

   file_transport = address_file
   pipe_transport = address_pipe
   retry_use_local_part
   file_transport = address_file
   pipe_transport = address_pipe
   retry_use_local_part


@@ -52,6 +56,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: