X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F0153;h=60a9cb9a5d71ac99950ad7b25e46e127e85b5c3f;hb=dab495e070dc243e03e146dc46ddbb3edba4f7ce;hp=b604f9b94af9138a640fd444a3a9c69516419109;hpb=afda344b580b54a4513569720aec3260cd5ba546;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/0153 b/test/confs/0153
index b604f9b94..60a9cb9a5 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,12 +1,7 @@
 # Exim test configuration 0153
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-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 -----
 
@@ -18,17 +13,14 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
-  address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{$1}}
-  data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
-           {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
-          fail}
+  data = ${lookup {$local_part} lsearch \
+		{${lookup {TESTNUM.alias.$1} dsearch,ret=full {DIR/aux-fixed} {$value}fail}}}
   no_more
 
 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 = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   no_more
 
 real: