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
typoes
[users/heiko/exim.git]
/
test
/
confs
/
0092
diff --git
a/test/confs/0092
b/test/confs/0092
index e0c221bbf84cd34060e6b0cbf19a3654478f0288..cdcf52330f8e7c6a84ec46f5548e3fde3408f792 100644
(file)
--- a/
test/confs/0092
+++ b/
test/confs/0092
@@
-7,20
+7,18
@@
domainlist local_domains = test.ex : *.test.ex
domainlist relay_domains = test.ex
domainlist relay_domains = test.ex
-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
-tls_advertise_hosts =
# ----- Main settings -----
OPT = 2s
# ----- Main settings -----
OPT = 2s
+
+.ifndef COM
smtp_receive_timeout = OPT
receive_timeout = 2s
smtp_receive_timeout = OPT
receive_timeout = 2s
+.endif
begin acl
begin acl