tidying

[exim.git] / test / confs / 5860

diff --git a/test/confs/5860 b/test/confs/5860
index 7dc4b0952c27e40b7e14fddca2fbaf5fbd93bdb0..94436c3449b08b9d64a7c052fb138289228b2a5c 100644 (file)
--- 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 -----
 
@@ -43,13 +38,13 @@ tls_privatekey = ${if eq {SERVER}{server} \
 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 -----
@@ -83,6 +78,6 @@ send_to_server:
                                 {= {0}{$tls_out_tlsa_usage}} } \
                         {*}{}}
 
-  tpda_event_action =   ${acl {logger}}
+  event_action =   ${acl {logger}}
 
 # End