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

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

diff --git a/test/confs/2201 b/test/confs/2201
index 7b257cce3dd5d96569a67343274a4cc81b58920d..3f8f4fb629d57a1f0ca1da994aed56c4e694c9c1 100644 (file)
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -1,16 +1,13 @@
 # Exim test configuration 2201
 
 # Exim test configuration 2201
 

-exim_path = EXIM_PATH
-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

 
 # ----- Main settings -----
 
 trusted_users = CALLER
 
 # ----- Main settings -----
 
 trusted_users = CALLER

+disable_ipv6

 
 acl_smtp_rcpt = check_rcpt
 acl_not_smtp = check_sndr
 
 acl_smtp_rcpt = check_rcpt
 acl_not_smtp = check_sndr


@@ -70,7 +67,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
 
 remote_delivery:
   user = CALLER
 
 remote_delivery:


@@ -78,6 +75,7 @@ remote_delivery:
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_D
   hosts = 127.0.0.1
   allow_localhost
   port = PORT_D

+  hosts_try_fastopen = :

 
 # ----- Retry -----
 
 
 # ----- Retry -----