X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0f06b4f296802e4e13188c740ea09419931a3020..b4a37a77271a8f6efc887d68265eb7867eff6170:/test/confs/5860?ds=sidebyside diff --git a/test/confs/5860 b/test/confs/5860 index 7dc4b0952..df9115129 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -1,16 +1,11 @@ -# Exim test configuration 5850 +# Exim test configuration 5860 # DANE 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 ----- @@ -79,10 +64,12 @@ send_to_server: # 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