Merge branch 'hs/fix-proxy-bh' (Closes 2656)

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

diff --git a/test/confs/0296 b/test/confs/0296
index 9af8750157bfd253d6306c0a2edfa3b72c24982d..6241af0032cac2404beed9fc031c54b3112be0e5 100644 (file)
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -1,18 +1,12 @@
 # Exim test configuration 0296
 
 # Exim test configuration 0296
 

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

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

-admin_groups = CALLER
+admin_groups = CALLERGROUP

 trusted_users = CALLER
 system_filter = DIR/aux-fixed/TESTNUM.Filter
 
 trusted_users = CALLER
 system_filter = DIR/aux-fixed/TESTNUM.Filter
 


@@ -31,7 +25,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 # End
   user = CALLER
 
 # End