New format for exim_message_id

[exim.git] / test / confs / 3700

diff --git a/test/confs/3700 b/test/confs/3700
index 4a8d38aaef63f3e07faa073e3c936ab9a8428694..598bc7f1a15c6971fe5623e8fa605a725306085f 100644 (file)
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -20,10 +20,11 @@ trusted_users = CALLER
 
 tls_on_connect_ports = PORT_S
 tls_advertise_hosts = *
 
 tls_on_connect_ports = PORT_S
 tls_advertise_hosts = *

-tls_certificate = DIR/aux-fixed/cert1
+tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+tls_privatekey =  DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key

 
 tls_verify_hosts = *
 
 tls_verify_hosts = *

-tls_verify_certificates = DIR/aux-fixed/cert2
+tls_verify_certificates = DIR/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem

 
 
 # ----- ACL -----
 
 
 # ----- ACL -----


@@ -78,8 +79,9 @@ t1:
   port = PORT_D
   hosts_try_fastopen = :
   allow_localhost
   port = PORT_D
   hosts_try_fastopen = :
   allow_localhost

-  tls_certificate =         DIR/aux-fixed/cert2
-  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_certificate =         DIR/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+  tls_privatekey =          DIR/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+  tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem

   tls_verify_cert_hostnames = :
 
 t2:
   tls_verify_cert_hostnames = :
 
 t2:


@@ -89,13 +91,15 @@ t2:
   hosts_try_fastopen = :
   protocol = smtps
   allow_localhost
   hosts_try_fastopen = :
   protocol = smtps
   allow_localhost

-  tls_certificate =         DIR/aux-fixed/cert2
-  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_certificate =         DIR/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+  tls_privatekey =          DIR/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+  tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem

   tls_verify_cert_hostnames = :
 
 file:
   driver = appendfile
   tls_verify_cert_hostnames = :
 
 file:
   driver = appendfile

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

   user = CALLER
 
 # End
   user = CALLER
 
 # End