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
/
0554
diff --git
a/test/confs/0554
b/test/confs/0554
index 2edb0ff6cdd46b8bd7b6013bfafab57369a50921..cbcd357a9c7fbb085627b14e11ac90e51cde26fd 100644
(file)
--- a/
test/confs/0554
+++ b/
test/confs/0554
@@
-1,12
+1,8
@@
# Exim test configuration 0554
# Exim test configuration 0554
-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 -----