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
/
0142
diff --git
a/test/confs/0142
b/test/confs/0142
index 86d91110172b070a033d7400099797423709bde5..716ad5fa75d32a78deb79cb6c940361e307064bb 100644
(file)
--- a/
test/confs/0142
+++ b/
test/confs/0142
@@
-1,12
+1,7
@@
# Exim test configuration 0142
# Exim test configuration 0142
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
# ----- Main settings -----
@@
-48,12
+43,12
@@
pipe:
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
filtered_delivery:
driver = appendfile
user = CALLER
filtered_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
transport_filter = DIR/bin/fd -f
user = CALLER
transport_filter = DIR/bin/fd -f
user = CALLER