DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 1002

diff --git a/test/confs/1002 b/test/confs/1002
index f39ea1e9ba7f1c014c34ee80e7dcbe675aee2583..1d9a36c36ac4309179bce78449ae1142966fe2c1 100644 (file)
--- a/test/confs/1002
+++ b/test/confs/1002
@@ -1,14 +1,8 @@
 # Exim test configuration 1002
 
 # Exim test configuration 1002
 

-exim_path = EXIM_PATH
-keep_environment =
-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 -----
 


@@ -80,6 +74,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