DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 5410

diff --git a/test/confs/5410 b/test/confs/5410
index 4c59adb95b39f689ebd4673d6d4ae2aac1f0ddf5..c56b4624d507022182f286c7b6c909b9b048f252 100644 (file)
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,19 +1,14 @@
 # Exim test configuration 5410
 
 # Exim test configuration 5410
 

-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 -----
 
 log_selector =  +smtp_confirmation
 tls_advertise_hosts = *
 
 # ----- Main settings -----
 
 log_selector =  +smtp_confirmation
 tls_advertise_hosts = *

-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1

 
 domainlist local_domains = test.ex : *.test.ex
 
 
 domainlist local_domains = test.ex : *.test.ex
 


@@ -52,9 +47,11 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
   hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}
   hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
   hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}

-  tls_try_verify_hosts = :
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :

 
 
 # End
 
 
 # End