DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 5860

diff --git a/test/confs/5860 b/test/confs/5860
index 956a5dc37f3f30b5380f424faa4bd45f6d456caa..bef70dd18730277c6e5a2bcf0446e14412f8ff57 100644 (file)
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 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 -----
 
@@ -24,32 +19,22 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 # Set certificate only if server
-CDIR1 = DIR/aux-fixed
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
-tls_certificate = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
-               {CDIR2/fullchain.pem}\
-               {CDIR1/cert1}}}\
-       fail}
-
-tls_privatekey = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
-               {CDIR2/server1.example.com.unlocked.key}\
-               {CDIR1/cert1}}}\
-       fail}
+tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem} fail}
+tls_privatekey = ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key} fail}
 
 
 begin acl
 
 logger:
-  accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
-        logwrite = $tpda_event depth = $tpda_data \
+  accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
+        logwrite = $event_name depth = $event_data \
                        <${certextract {subject} {$tls_out_peercert}}>
 #  message = noooo
 
-  accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
-        logwrite = $tpda_event dane=$tls_out_dane
+  accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+        logwrite = $event_name dane=$tls_out_dane
   accept
 
 # ----- Routers -----
@@ -76,13 +61,16 @@ send_to_server:
   driver = smtp
   allow_localhost
   port = PORT_D
+  hosts_try_fastopen = :
 
 #  hosts_try_dane = *
   hosts_require_dane = *
+.ifdef _HAVE_OCSP
   hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
                                 {= {0}{$tls_out_tlsa_usage}} } \
                         {*}{}}
+.endif
 
-  tpda_event_action =   ${acl {logger}}
+  event_action =   ${acl {logger}}
 
 # End