refactor

[exim.git] / test / confs / 2114

diff --git a/test/confs/2114 b/test/confs/2114
index d856e98bc904df76acb1ce9b2e93bf5a83af70d0..1e5a1768cf9b3147ed7dacc4f9be8eb9bc8924ee 100644 (file)
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -2,14 +2,9 @@
 
 CRL=
 
 
 CRL=
 

-exim_path = EXIM_PATH
-keep_environment =
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -27,7 +22,7 @@ tls_privatekey = DIR/aux-fixed/cert1
 
 tls_verify_hosts = HOSTIPV4
 tls_try_verify_hosts = *
 
 tls_verify_hosts = HOSTIPV4
 tls_try_verify_hosts = *

-tls_verify_certificates = DIR/aux-fixed/cert2
+tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem

 tls_crl = CRL
 
 
 tls_crl = CRL
 
 


@@ -58,6 +53,7 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn
   user = CALLER