X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/dc8ae77b80164fe6abf7f55c8deffcfc91c2aebf..600dc06981df5a906125f8442c36056a117412d4:/test/confs/0612?ds=sidebyside

diff --git a/test/confs/0612 b/test/confs/0612
index 9350a97ae..f4f427246 100644
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,5 +1,6 @@
 # Exim test configuration 0612
-# log_defer_output on pipe transport
+
+SERVER =
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -7,35 +8,100 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
+.ifdef OPT
+dsn_advertise_hosts = *
+.endif
+delay_warning = 6s : 24h
+
+accept_8bitmime = false
+pipelining_advertise_hosts = :
+
+trusted_users = CALLER
+acl_smtp_rcpt = rcpt
+
 log_selector = +received_recipients
+queue_only
+queue_run_in_order
+
+
+.ifdef _HAVE_EVENT
+event_action = ${acl {ev_log}}
+.endif
+
+#
+
+begin acl
 
-#acl_smtp_rcpt = accept
+.ifdef _HAVE_EVENT
+ev_log:
+  accept logwrite = event $event_name
+.endif
+
+rcpt:
+  accept	hosts =	HOSTIPV4
+
+  deny		local_parts =	rmt_reject
+  defer		local_parts =	rmt_defer
+  accept	local_parts =	rmt_fakereject
+		control =	fakereject
+  accept
 
 # ----- Routers -----
 
 begin routers
 
-client:
+r_dump:
+  driver =	redirect
+  domains =	dump.ex
+  data =	:blackhole:
+
+r1:
   driver =	accept
-  transport =	pipe
+  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
 
-pipe:
-    driver      = pipe
-    temp_errors = *
-    command     = perl -e "print 'Hi from pipe'; exit 5;"
-    log_defer_output = true
-    path	= /bin:/usr/bin:/usr/local/bin
-
-# ----- Retry -----
-
+smtp:
+  driver =	smtp
+.ifdef _HAVE_EVENT
+  event_action = ${acl {ev_log}}
+.endif
+  hosts_try_fastopen = :
+
+bad_tpt:
+  driver =	smtp
+  connect_timeout = 1s
+.ifdef _HAVE_EVENT
+  event_action = ${acl {ev_log}}
+.endif
+
+tofile:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
+  user = CALLER
+.ifdef _HAVE_EVENT
+  event_action = ${acl {ev_log}}
+.endif
 
 begin retry
 
-* * F,1h,10m
-
-
+*	*	F,2m,10s
 # End