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
Merge branch 'hs/fix-proxy-bh' (Closes 2656)
[users/heiko/exim.git]
/
test
/
confs
/
0550
diff --git
a/test/confs/0550
b/test/confs/0550
index e08750fdd1ffa7a573beee3e92c1c93efb67776b..16699b3ac568ca8e94174991e3a59a9e17d822f3 100644
(file)
--- a/
test/confs/0550
+++ b/
test/confs/0550
@@
-1,13
+1,8
@@
# Exim test configuration 0550
# Exim test configuration 0550
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
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
# ----- Main settings -----
# ----- Main settings -----
@@
-29,6
+24,7
@@
t1:
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_S
driver = smtp
hosts = 127.0.0.1 : HOSTIPV4
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
helo_data = \
${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \
allow_localhost
helo_data = \
${if eq{$sending_ip_address}{127.0.0.1}{Tweedledum}{Tweedledee}} \