DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0461

diff --git a/test/confs/0461 b/test/confs/0461
index f56d6ad57490679120ff47d9f9f5342848b8d3bc..f7c3ba1805ef123852a008e826602bef3d6debd5 100644 (file)
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -5,14 +5,9 @@ ROUTE_DATA=V4NET.0.0.1
 RETRY1=1s
 RETRY2=2s
 
 RETRY1=1s
 RETRY2=2s
 

-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 -----


@@ -42,13 +37,14 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
+  hosts_try_fastopen = :

   connect_timeout = 1s
   allow_localhost
 
 t2:
   driver = appendfile
   file = DIR/test-mail/$local_part
   connect_timeout = 1s
   allow_localhost
 
 t2:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 
   user = CALLER