DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0318

diff --git a/test/confs/0318 b/test/confs/0318
index fcb3c454cf2b9813f3e945541604b9ec2af1a6e5..b57794e073e2f8f5b488d8cd4fd6739625558cc8 100644 (file)
--- a/test/confs/0318
+++ b/test/confs/0318
@@ -1,13 +1,7 @@
 # Exim test configuration 0318
 
 # Exim test configuration 0318
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -30,8 +24,10 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  directory = DIR/test-mail
+  directory = DIR/test-mail/subdir
+  create_directory

   directory_file = $local_part
   directory_file = $local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 
   user = CALLER