typoes

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

diff --git a/test/confs/2113 b/test/confs/2113
index d9ac5044798fef8e029d2b882768ff268a398549..e5fc5393d4846fe92258a2da0144415cbbe80e21 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -1,20 +1,17 @@
 # Exim test configuration 2113
 
 SERVER =
 # Exim test configuration 2113
 
 SERVER =

+PEX = :
+
+.include DIR/aux-var/tls_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

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

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

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 

-log_selector = +tls_peerdn+smtp_connection+incoming_port
+log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients

 
 queue_only
 queue_run_in_order
 
 queue_only
 queue_run_in_order


@@ -33,6 +30,15 @@ tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 begin routers
 
 
 begin routers
 

+.ifdef REQUIRE
+cl_override:
+  driver = manualroute
+  route_data = HOSTIPV4
+  retry_use_local_part
+  transport = send_to_server
+  self = send
+.endif
+

 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}
 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}


@@ -51,15 +57,18 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
 send_to_server:
   driver = smtp
   allow_localhost
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
 send_to_server:
   driver = smtp
   allow_localhost

+  hosts_override

   hosts = 127.0.0.1
   port = PORT_D
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_noproxy_tls = PEX

   tls_try_verify_hosts = :
 
 # End
   tls_try_verify_hosts = :
 
 # End