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
/
0204
diff --git
a/test/confs/0204
b/test/confs/0204
index e5792de54bc985948e84ca302c6b71edec3c7759..688e0e98bd9863f43474d21dabaa7e0d04279997 100644
(file)
--- a/
test/confs/0204
+++ b/
test/confs/0204
@@
-1,14
+1,8
@@
# Exim test configuration 0204
# Exim test configuration 0204
-exim_path = EXIM_PATH
-keep_environment =
-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
-tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
@@
-31,7
+25,7
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
user = CALLER