git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: Make patchexim work with dirty tag checkouts
[users/jgh/exim.git]
/
test
/
confs
/
0548
diff --git
a/test/confs/0548
b/test/confs/0548
index 18ef2abdd4d8a40048fed6c9ab46d72522564c9d..3e1f0ebfc5e8335e9941085d6309894da75296da 100644
(file)
--- a/
test/confs/0548
+++ b/
test/confs/0548
@@
-2,19
+2,15
@@
SERVER=
SERVER=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
acl_smtp_connect = acl_connect
acl_smtp_rcpt = acl_rcpt
qualify_domain = test.ex
# ----- Main settings -----
acl_smtp_connect = acl_connect
acl_smtp_rcpt = acl_rcpt
qualify_domain = test.ex
+queue_run_in_order
# ----- ACLs -----
# ----- ACLs -----
@@
-54,7
+50,7
@@
smtp:
begin retry
begin retry
-thishost.test.ex * F,
15s,1
s
+thishost.test.ex * F,
20s,2
s
* * F,1s,1s; F,1s,5s
# End
* * F,1s,1s; F,1s,5s
# End