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

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

diff --git a/test/confs/2133 b/test/confs/2133
index e05197980dd7cf1dc926138829ab50db263bdd70..463e614ca5c9725dbd119dc896e55319bd62a686 100644 (file)
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -3,13 +3,9 @@
 
 SERVER=
 
 
 SERVER=
 

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

 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

 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com


@@ -23,6 +19,8 @@ KEY2 =  FX/cert2
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+disable_ipv6 = true
+

 acl_smtp_rcpt = accept
 
 log_selector =  +tls_peerdn+tls_certificate_verified
 acl_smtp_rcpt = accept
 
 log_selector =  +tls_peerdn+tls_certificate_verified


@@ -83,7 +81,7 @@ client_r:
 
 client_s:
   driver = accept
 
 client_s:
   driver = accept

-  local_parts = users
+  local_parts = user_s

   retry_use_local_part
   transport = send_to_server_req_passname
 
   retry_use_local_part
   transport = send_to_server_req_passname
 


@@ -103,8 +101,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -115,8 +114,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -128,8 +128,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -143,6 +144,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -156,6 +158,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -170,6 +173,7 @@ send_to_server_req_passname:
   allow_localhost
   hosts = server1.example.com
   port = PORT_D
   allow_localhost
   hosts = server1.example.com
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2
 


@@ -182,6 +186,7 @@ send_to_server_req_failcarryon:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D

+  hosts_try_fastopen = :

   tls_certificate = CERT2
   tls_privatekey = CERT2
 
   tls_certificate = CERT2
   tls_privatekey = CERT2