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 from master into 4.next
[users/heiko/exim.git]
/
test
/
confs
/
2015
diff --git
a/test/confs/2015
b/test/confs/2015
index 734c2834af21bb0967542a75de064fa7744cc339..e17fc29e94b10258756492c25f5f3fd80dfe82a3 100644
(file)
--- a/
test/confs/2015
+++ b/
test/confs/2015
@@
-1,12
+1,8
@@
# Exim test configuration 2015
# Exim test configuration 2015
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_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 -----