Logging: add I= element to transport-defer lines. Bug 2675

[exim.git] / test / confs / 0608

diff --git a/test/confs/0608 b/test/confs/0608
index 0ca40c770fff52f819d8a375d006a444d1952912..a2ec1be27a849e4aa79f97e5814ca67bd268178f 100644 (file)
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -1,4 +1,5 @@
 # Exim test configuration 0608
+# Bounces
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -6,15 +7,43 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-acl_smtp_helo = check_helo
+acl_smtp_rcpt = accept
+log_selector = +received_recipients +millisec
 
+.ifdef OPT
+bounce_message_file = OPT
+warn_message_file = OPT
+.endif
 
-# ----- ACLs -----
+delay_warning =        1s
 
-begin acl
+# ----- Routers -----
+
+begin routers
+
+delay:
+  driver =     redirect
+  local_parts =        ^delay
+  allow_defer
+  data =       :defer: deliberate for test purposes
+
+bounces:
+  driver =     accept
+  condition =  ${if !def:sender_address}
+  transport =  savebounce
+
+begin transports
+
+savebounce:
+  driver =     appendfile
+  file =       DIR/test-mail/bounce_message
+  user =       CALLER
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,100s
 
-check_helo:
-  require verify = helo
-  accept  logwrite = helo $sender_helo_name dnssec <$sender_helo_dnssec>
 
 # End