git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug: tag client SMTP output with buffering qualifier
[users/heiko/exim.git]
/
test
/
confs
/
0612
diff --git
a/test/confs/0612
b/test/confs/0612
index 84260df657d6fa913f7651d29950682a75637de2..da5b72f22bf9e1a86b9f32338bab207665a28712 100644
(file)
--- a/
test/confs/0612
+++ b/
test/confs/0612
@@
-1,5
+1,6
@@
# Exim test configuration 0612
# Exim test configuration 0612
-# log_defer_output on pipe transport
+
+SERVER =
.include DIR/aux-var/std_conf_prefix
.include DIR/aux-var/std_conf_prefix
@@
-7,35
+8,87
@@
primary_hostname = myhost.test.ex
# ----- Main settings -----
# ----- 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
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
# ----- Routers -----
begin routers
-client:
+r_dump:
+ driver = redirect
+ domains = dump.ex
+ data = :blackhole:
+
+r1:
driver = accept
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
# ----- Transports -----
begin transports
-pipe:
- driver = pipe
- temp_errors = *
- command = perl -e "print 'Hi from pipe'; exit 5;"
- log_defer_output = true
- path = ${env{PATH}}
+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/${bless:$local_part}
+ user = CALLER
+ event_action = ${acl {ev_log}}
begin retry
begin retry
-* * F,1h,10m
-
-
+* * F,2m,10s
# End
# End