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

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

diff --git a/test/confs/0299 b/test/confs/0299
index fa351a774ddc1e72c55f42a5d5af9a24a2322e81..629f9c40d23c94c922865cd4599e38832754045c 100644 (file)
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -1,14 +1,8 @@
 # Exim test configuration 0299
 
 # Exim test configuration 0299
 

-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 -----
 


@@ -36,7 +30,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
   shadow_transport = t3
 
   user = CALLER
   shadow_transport = t3
 


@@ -44,6 +38,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   max_rcpt = 2
 
   allow_localhost
   max_rcpt = 2