testsuite: abstract out common conf settings

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

diff --git a/test/confs/5840 b/test/confs/5840
index 2c72b64c3fa7ff9ca6662697ac01a9ad95456888..ac3578dc9a3ca113814ac3d625083433ecaef9fe 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -3,18 +3,17 @@
 
 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

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

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

+.ifndef OPT

 acl_smtp_rcpt = accept
 acl_smtp_rcpt = accept

+.else
+acl_smtp_rcpt = accept verify = recipient/callout
+.endif

 
 log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
 
 
 log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
 


@@ -48,6 +47,7 @@ client:
   dnssec_request_domains = *
   self = send
   transport = send_to_server
   dnssec_request_domains = *
   self = send
   transport = send_to_server

+  errors_to = ""

 
 server:
   driver = redirect
 
 server:
   driver = redirect


@@ -65,9 +65,7 @@ send_to_server:
 
   hosts_try_dane =     *
   hosts_require_dane = !thishost.test.ex
 
   hosts_try_dane =     *
   hosts_require_dane = !thishost.test.ex

-  hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
-                                {= {0}{$tls_out_tlsa_usage}} } \
-                        {*}{}}
+  tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}

   tls_try_verify_hosts = thishost.test.ex
   tls_verify_certificates = CDIR2/ca_chain.pem
 
   tls_try_verify_hosts = thishost.test.ex
   tls_verify_certificates = CDIR2/ca_chain.pem