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
/
0037
diff --git
a/test/confs/0037
b/test/confs/0037
index 98ef4d3d4b6f667c98bf7e029a7743f2e4e014ce..c26f55364a793c83cc8c3989bf7a771561c11206 100644
(file)
--- a/
test/confs/0037
+++ b/
test/confs/0037
@@
-2,13
+2,8
@@
FILTER_PREPEND_HOME=
FILTER_PREPEND_HOME=
-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 -----
@@
-90,7
+85,7
@@
appendfile:
driver = appendfile
delivery_date_add
envelope_to_add
driver = appendfile
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
return_path_add
user = CALLER
return_path_add
user = CALLER
@@
-98,6
+93,7
@@
address_reply:
driver = autoreply
never_mail = never_mail@test.ex
user = CALLER
driver = autoreply
never_mail = never_mail@test.ex
user = CALLER
+ current_directory = DIR/test-mail
initgroups
# End
initgroups
# End