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 '4.next'
[users/heiko/exim.git]
/
test
/
confs
/
4029
diff --git
a/test/confs/4029
b/test/confs/4029
index ae4e71850972adbe2e1c60806e492f8b18aacd9e..119f8ce55d2e54b53a646ec08032944695ca4dab 100644
(file)
--- a/
test/confs/4029
+++ b/
test/confs/4029
@@
-4,13
+4,9
@@
OPT =
SERVER=
OPT =
SERVER=
-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
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-52,6
+48,7
@@
begin transports
my_smtp:
driver = smtp
port = PORT_D
my_smtp:
driver = smtp
port = PORT_D
+ hosts_try_fastopen = :
socks_proxy = 127.0.0.1 port=1080 OPT
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
socks_proxy = 127.0.0.1 port=1080 OPT
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2