refactor

[exim.git] / test / confs / 0270

diff --git a/test/confs/0270 b/test/confs/0270
index f05958861b8a8ea4e5de18f9c34425d3eef5a516..7dae6d523dede6396338745c7f18ebd8aae8b5cf 100644 (file)
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -1,13 +1,8 @@
 # Exim test configuration 0270
 
 # Exim test configuration 0270
 

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

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -21,6 +16,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
   envelope_to_add
   return_path_add
   user = CALLER
   envelope_to_add
   return_path_add


@@ -34,14 +30,14 @@ r1:
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex

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

 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex
 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex

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

   no_more
 
 r2:
   no_more
 
 r2:


@@ -51,7 +47,7 @@ r2:
   syntax_errors_to = postmaster@test.ex
   syntax_errors_text = "There's an error in your filter file.\n\
                         The file has been ignored."
   syntax_errors_to = postmaster@test.ex
   syntax_errors_text = "There's an error in your filter file.\n\
                         The file has been ignored."

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

   allow_filter
   router_home_directory = DIR/
   user = CALLER
   allow_filter
   router_home_directory = DIR/
   user = CALLER