git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mis-merge
[exim.git]
/
test
/
confs
/
0521
diff --git
a/test/confs/0521
b/test/confs/0521
index b47129f146856377d83e965846553a1ef439f39a..8c9c7004280f9ff04aab127281d91cf335bc59d8 100644
(file)
--- a/
test/confs/0521
+++ b/
test/confs/0521
@@
-1,14
+1,8
@@
# Exim test configuration 0521
# Exim test configuration 0521
-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 -----