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

[exim.git] / test / confs / 0618

diff --git a/test/confs/0618 b/test/confs/0618
index 7359e16336d239e7053d5b74e6b8eed1f9e05fff..420e290412b4f0a381d18ffeacf77e32f24d8f23 100644 (file)
--- a/test/confs/0618
+++ b/test/confs/0618
@@ -1,94 +1,23 @@
 # Exim test configuration 0618
 
-SERVER =
-
 .include DIR/aux-var/std_conf_prefix
 
-primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-.ifdef OPT
-dsn_advertise_hosts = *
-.endif
-delay_warning = 3s : 24h
-
-accept_8bitmime = false
-pipelining_advertise_hosts = :
+domainlist local_domains = @
 
-trusted_users = CALLER
-acl_smtp_rcpt = rcpt
+acl_smtp_rcpt = chk_rcpt
 
-log_selector = +received_recipients
 queue_only
-queue_run_in_order
-
 
-event_action = ${acl {ev_log}}
 
-#
+# ----- ACL -----
 
 begin acl
 
-ev_log:
-  accept logwrite = event $event_name
-
-rcpt:
-  accept hosts =       HOSTIPV4
-
-  deny local_parts =   rmt_reject
-  defer        local_parts =   rmt_defer
-  accept
-
-# ----- Routers -----
-
-begin routers
-
-r_dump:
-  driver =     redirect
-  domains =    dump.ex
-  data =       :blackhole:
-
-r1:
-  driver =     accept
-  condition =  ${if eq {127.0.0.1}{$sender_host_address}}
-  transport =  tofile
-
-r2:
-  driver =     manualroute
-  local_parts =        ^rmt_.*
-  route_list = * 127.0.0.1::PORT_D
-  self =       send
-  transport =  smtp
-
-r3:
-  driver =     manualroute
-  local_parts =        deferred
-  route_list = * 127.0.0.1::PORT_S
-  self =       send
-  transport =  bad_tpt
-
-# ----- Transports -----
-
-begin transports
-
-smtp:
-  driver =     smtp
-  event_action = ${acl {ev_log}}
-  hosts_try_fastopen = :
-
-bad_tpt:
-  driver =     smtp
-  connect_timeout = 1s
-  event_action = ${acl {ev_log}}
-
-tofile:
-  driver = appendfile
-  file = DIR/test-mail/$local_part
-  user = CALLER
-  event_action = ${acl {ev_log}}
-
-begin retry
+chk_rcpt:
+  accept       local_parts =   lsearch;DIR/aux-fixed/TESTNUM.list
+               domains =       lsearch;DIR/aux-fixed/TESTNUM.list
 
-*      *       F,1m,3s
 # End