DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0025

diff --git a/test/confs/0025 b/test/confs/0025
index a655d5f881fd36f014807f0d9cd58661e13f1e22..c13245194a0cf8316bc4639956808bb2884cddc7 100644 (file)
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,13 +1,8 @@
 # Exim test configuration 0025
 
 # Exim test configuration 0025
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -58,6 +53,7 @@ dev_null:
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 # End
   user = CALLER
 
 # End