X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..92562f63be6fae2526d68171d60bf87027551f88:/test/confs/0153 diff --git a/test/confs/0153 b/test/confs/0153 index 171d6f5ac..35a004a45 100644 --- a/test/confs/0153 +++ b/test/confs/0153 @@ -1,13 +1,7 @@ # Exim test configuration 0153 -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME -tls_advertise_hosts = +.include DIR/aux-var/std_conf_prefix + # ----- Main settings ----- @@ -19,7 +13,7 @@ begin routers virtual: driver = redirect domains = *.virt.test.ex - address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{$1}} + address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{${bless:$1}}} data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \ {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \ fail} @@ -28,8 +22,8 @@ virtual: list: driver = redirect domains = list.test.ex - file = ${if exists{DIR/aux-fixed/TESTNUM.list.$local_part} \ - {DIR/aux-fixed/TESTNUM.list.$local_part}fail} + file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \ + {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail} no_more real: