DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0031

diff --git a/test/confs/0031 b/test/confs/0031
index d4452ac3a9fbdde5c0d36931e53ccd4aa86a1305..8dac996ae63c1dddfdbcc2423e33d811ac3f38a1 100644 (file)
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,12 +1,8 @@
 # Exim test configuration 0031
 
 # Exim test configuration 0031
 

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

 primary_hostname = myhost.ex
 primary_hostname = myhost.ex

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

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


@@ -34,6 +30,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   return_path_add
 
 # End
   return_path_add
 
 # End