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
Testsuite: allow time for retry-time expiry
[users/heiko/exim.git]
/
test
/
confs
/
5400
diff --git
a/test/confs/5400
b/test/confs/5400
index 8f2e8b585f1c0d5ae341c7e68e97cf4d7fc8c623..2a2d4586047b128a16e01acd5ea131b50be2837b 100644
(file)
--- a/
test/confs/5400
+++ b/
test/confs/5400
@@
-3,11
+3,13
@@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
+
+log_selector = +received_recipients
# ----- Main settings -----
# ----- Main settings -----
@@
-28,12
+30,20
@@
ar:
begin routers
begin routers
+dns:
+ driver = dnslookup
+ domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex
+ self = send
+ transport = smtp
+
all:
driver = manualroute
domains = ! +local_domains
all:
driver = manualroute
domains = ! +local_domains
- route_list = * 127.0.0.1
+ route_list =
special.com HOSTIPV4 ;
* 127.0.0.1
self = send
self = send
- transport = smtp
+ transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
+ headers_remove = X-hdr-rtr
+ headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++
no_more
no_more
@@
-45,6
+55,12
@@
smtp:
driver = smtp
interface = HOSTIPV4
port = PORT_S
driver = smtp
interface = HOSTIPV4
port = PORT_S
+ headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
+
+smtp2:
+ driver = smtp
+ interface = HOSTIPV4
+ port = PORT_S
# End
# End