DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0374

diff --git a/test/confs/0374 b/test/confs/0374
index 3c1381b8c37864c599e238efc4adbfde3a747fd6..81a3667d350a5c944513fcc1f8b14986647b87ae 100644 (file)
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -1,13 +1,8 @@
 # Exim test configuration 0374
 
 # Exim test configuration 0374
 

-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

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

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


@@ -56,6 +51,7 @@ begin transports
 ut1:
   driver = appendfile
   file = DIR/test-mail/$local_part-u
 ut1:
   driver = appendfile
   file = DIR/test-mail/$local_part-u

+  create_file = DIR/test-mail

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add


@@ -80,6 +76,7 @@ ut3:
 ut4:
   driver = smtp
   hosts = 127.0.0.1
 ut4:
   driver = smtp
   hosts = 127.0.0.1

+  hosts_try_fastopen = :

   port = PORT_S
   allow_localhost
   max_rcpt = 1
   port = PORT_S
   allow_localhost
   max_rcpt = 1


@@ -88,6 +85,7 @@ ut4:
 real:
   driver = appendfile
   file = DIR/test-mail/$local_part
 real:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
   return_path_add
   envelope_to_add
   user = CALLER
   return_path_add
   envelope_to_add