DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0218

diff --git a/test/confs/0218 b/test/confs/0218
index fae18f0e13b7f7e14efb9945ea0bc74e97e563db..250bc92e6618bbacdfd70e90c9bfe8dfd2cebb93 100644 (file)
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -1,19 +1,14 @@
 # Exim test configuration 0218
 
 # Exim test configuration 0218
 

-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 -----
 
 log_selector =  \
 
 # ----- Main settings -----
 
 log_selector =  \

-              +sender_on_delivery
+              +sender_on_delivery \
+             +pipelining

 ignore_bounce_errors_after = 0s
 qualify_domain = test.ex
 queue_run_in_order
 ignore_bounce_errors_after = 0s
 qualify_domain = test.ex
 queue_run_in_order


@@ -57,6 +52,7 @@ send_to_server:
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   debug_print = T: $transport_name  (${acl {expand_check}})
 
 
   debug_print = T: $transport_name  (${acl {expand_check}})