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
/
1002
diff --git
a/test/confs/1002
b/test/confs/1002
index 99a5866d9858d24e13ea16e814d7e86926476ab5..2ddf2a888101babb3a29756ad41f6f798c0a742e 100644
(file)
--- a/
test/confs/1002
+++ b/
test/confs/1002
@@
-1,12
+1,8
@@
# Exim test configuration 1002
# Exim test configuration 1002
-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 -----
@@
-77,7
+73,7
@@
dev_null:
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
# End
user = CALLER
# End