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 output changes resulting
[users/heiko/exim.git]
/
test
/
confs
/
0211
diff --git
a/test/confs/0211
b/test/confs/0211
index 389437340cdbd393a69c227c7aa0bbee1d89487e..f68b036bea75118afdab329fac9bcd6abc843e08 100644
(file)
--- a/
test/confs/0211
+++ b/
test/confs/0211
@@
-1,12
+1,7
@@
# Exim test configuration 0211
# Exim test configuration 0211
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
# ----- Main settings -----
@@
-35,7
+30,11
@@
begin routers
others:
driver = manualroute
domains = ! +local_domains
others:
driver = manualroute
domains = ! +local_domains
- route_list = * 127.0.0.1 byname
+.ifdef LIST
+ route_data = 127.0.0.1:HOSTIPV4
+.else
+ route_data = localhost4.test.ex byname
+.endif
self = send
transport = smtp
no_more
self = send
transport = smtp
no_more
@@
-53,10
+52,12
@@
begin transports
smtp:
driver = smtp
port = PORT_S
smtp:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
+ command_timeout = 1s
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
return_path_add
user = CALLER
return_path_add
user = CALLER