DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0026

diff --git a/test/confs/0026 b/test/confs/0026
index 5a0c04e137ace09c8a172796719c0940dacd9ee7..6407981b615a2dfe14e13526491ce7fd61f86d96 100644 (file)
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,13 +1,8 @@
 # Exim test configuration 0026
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -25,6 +20,7 @@ begin acl
 acl_data:
   deny     log_message = body contains trigger
            condition = ${if match{$message_body}{trigger}{yes}{no}}
+  warn    logwrite = \$h_from: '$h_from:'
   require  verify = header_syntax
   warn     message = X-warning: this is a test warning
   accept   senders = ! :
@@ -59,6 +55,7 @@ dev_null:
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End