Testsuite: TLS server testcase consolidation

[users/heiko/exim.git] / test / confs / 0153

diff --git a/test/confs/0153 b/test/confs/0153
index b604f9b94af9138a640fd444a3a9c69516419109..35a004a455a859f1443874ed74d80af95df9fd2e 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,12 +1,7 @@
 # Exim test configuration 0153
 
 # 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 -----
 
 
 # ----- Main settings -----
 


@@ -18,7 +13,7 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
 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}
   data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
            {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
           fail}


@@ -27,8 +22,8 @@ virtual:
 list:
   driver = redirect
   domains = list.test.ex
 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:
   no_more
 
 real: