X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a08c49f10dbed682e0500e6510c78bd65002fc34..7b162fc84e202a16b89fa11224737ffbdd240bc8:/test/confs/0307?ds=sidebyside diff --git a/test/confs/0307 b/test/confs/0307 index e64a14edd..e07ef794f 100644 --- a/test/confs/0307 +++ b/test/confs/0307 @@ -1,12 +1,8 @@ # Exim test configuration 0307 -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/std_conf_prefix + primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -23,12 +19,10 @@ r1: domains = lists.test.ex local_part_suffix = -request local_part_suffix_optional - senders = ${if eq {$local_part_suffix}{-request}{*}\ - {\ - ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\ - {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}\ - }} - file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix + senders = ${if eq {$local_part_suffix}{-request} \ + {*} \ + {${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}{*}}} } + file = ${lookup {$local_part$local_part_suffix} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail} forbid_pipe forbid_file one_time @@ -59,6 +53,7 @@ begin transports t1: driver = appendfile file = DIR/test-mail/$local_part + create_file = DIR/test-mail user = CALLER t2: