DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0615

diff --git a/test/confs/0615 b/test/confs/0615
index 0cf5769a9ccb3426e14b7533fc85b6d0310d15b2..902e097ac7b60374c6af4ed5d512ed065420d23a 100644 (file)
--- a/test/confs/0615
+++ b/test/confs/0615
@@ -1,32 +1,56 @@
 # Exim test configuration 0615
 # Exim test configuration 0615

+# Send many messages in hopes of tripping continuation records code

 
 

-keep_environment = PATH
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
+hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
+untrusted_set_sender = *

 
 

-log_file_path = DIR/spool/log/%slog : syslog
+SERVER =

 
 

-gecos_pattern = ""
-gecos_name = CALLER_NAME
-chunking_advertise_hosts =
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix

 
 

-.ifdef _HAVE_DMARC
-dmarc_tld_file =
-.endif
+rfc1413_query_timeout = 0s
+log_selector = +sender_on_delivery +millisec
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept

 
 

-primary_hostname = myhost.test.ex

 queue_only
 queue_only

+queue_run_in_order

 
 

-# ----- Main settings -----
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  transport = send_to_server

 
 

-log_selector = LOG_SELECTOR
-log_timezone = TIMES
+server:
+  driver = accept
+  transport = send_to_server

 
 

-syslog_timestamp = ARG1
-syslog_pid = ARG2

 
 

-acl_not_smtp = accept logwrite = msg
+# ----- Transports -----

 
 

+begin transports
+
+send_to_server:
+  driver = smtp
+  connection_max_messages = 0
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  hosts_try_fastopen = :
+  # assumes that HOSTIPV4 can send to 127.0.0.1
+  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,10s

 
 # End
 
 # End

+