git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: honour the "build" environment variable
[users/jgh/exim.git]
/
test
/
confs
/
4020
diff --git
a/test/confs/4020
b/test/confs/4020
index 8a3a91fccaa081d4a61f617af643ba1a35bf1961..8dfd46888404a2e407864677632b351901d85874 100644
(file)
--- a/
test/confs/4020
+++ b/
test/confs/4020
@@
-2,16
+2,14
@@
OPT =
OPT =
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
+log_selector = +proxy +outgoing_port
+
domainlist local_domains = test.ex : *.test.ex
acl_smtp_rcpt = accept
domainlist local_domains = test.ex : *.test.ex
acl_smtp_rcpt = accept
@@
-37,7
+35,7
@@
my_smtp:
driver = smtp
interface = HOSTIPV4
port = PORT_S
driver = smtp
interface = HOSTIPV4
port = PORT_S
-
socks_proxy = 127.0.0.1 port=PORT_S
OPT
+
hide socks_proxy = 127.0.0.1 port=PORT_D
OPT
debug_print = transport_name <$transport_name>
debug_print = transport_name <$transport_name>