tidying

[exim.git] / test / confs / 4650

diff --git a/test/confs/4650 b/test/confs/4650
index e6c7884365e3d32d8d2819c82bacf22983f1b303..c0b73d425d4d2a831019c0725c6eb3d374e20d50 100644 (file)
--- a/test/confs/4650
+++ b/test/confs/4650
@@ -1,12 +1,25 @@
 # Exim test configuration 4650
 
-.include DIR/aux-var/std_conf_prefix
+exim_path = EXIM_PATH
+keep_environment =
+host_lookup_order = bydns
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts = *
+tls_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
 
 primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 dmarc_tld_file = DIR/aux-fixed/TESTNUM.tldfile
+dmarc_history_file = DIR/tmp/TESTNUM.hist.dmarc
+dkim_verify_hashes = sha256 : sha512 : sha1
 
 acl_smtp_rcpt = accept
 acl_smtp_data = check_data
@@ -23,6 +36,8 @@ check_data:
                logwrite =      dmarc_status_text <$dmarc_status_text>
                logwrite =      dmarc_used_domain <$dmarc_used_domain>
                logwrite =      dmarc_domain_policy <$dmarc_domain_policy>
+               logwrite =      dmarc_alignment_spf <$dmarc_alignment_spf>
+               logwrite =      dmarc_alignment_dkim <$dmarc_alignment_dkim>
                logwrite =      ${authresults {$primary_hostname}}
 
 # End