testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 0612

diff --git a/test/confs/0612 b/test/confs/0612
index cac65b1842ea5d487c2890751c6c7d99b23aa895..b3174aabcc3749cd8e791c81a2ff1803f88f3b2a 100644 (file)
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,46 +1,95 @@
 # Exim test configuration 0612
-# log_defer_output on pipe transport
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+SERVER =
+
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
+.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
+
+
+event_action = ${acl {ev_log}}
 
-#acl_smtp_rcpt = accept
+#
+
+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
 
-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
+smtp:
+  driver =     smtp
+  event_action = ${acl {ev_log}}
+  hosts_try_fastopen = :
 
-# ----- Retry -----
+bad_tpt:
+  driver =     smtp
+  connect_timeout = 1s
+  event_action = ${acl {ev_log}}
 
+tofile:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
+  user = CALLER
+  event_action = ${acl {ev_log}}
 
 begin retry
 
-* * F,1h,10m
-
-
+*      *       F,2m,10s
 # End