DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0504

diff --git a/test/confs/0504 b/test/confs/0504
index 5030b55ba3c75328353b07d48c6fa3e2282b2e28..c8bcf0fd2a4d13b878b55b05b58367de496d065b 100644 (file)
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -1,12 +1,8 @@
 # Exim test configuration 0504
 
 # Exim test configuration 0504
 

-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

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


@@ -17,7 +13,7 @@ begin routers
 
 r1:
   driver = accept
 
 r1:
   driver = accept

-  transport = $h_transport:
+  transport = OPT

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -27,6 +23,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
   transport_filter = /non/existent/file
 
   user = CALLER
   transport_filter = /non/existent/file
 


@@ -39,6 +36,7 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   transport_filter = /non/existent/file
 
   allow_localhost
   transport_filter = /non/existent/file