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
LibreSSL: fixes pulled from OpenBSD patchset
[exim.git]
/
test
/
confs
/
0504
diff --git
a/test/confs/0504
b/test/confs/0504
index 687173b4a7983ec8cf8e449c11026687edacea13..c8bcf0fd2a4d13b878b55b05b58367de496d065b 100644
(file)
--- a/
test/confs/0504
+++ b/
test/confs/0504
@@
-1,14
+1,8
@@
# Exim test configuration 0504
# Exim test configuration 0504
-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 -----
@@
-19,7
+13,7
@@
begin routers
r1:
driver = accept
r1:
driver = accept
- transport =
$h_transport:
+ transport =
OPT
# ----- Transports -----
# ----- Transports -----
@@
-29,6
+23,7
@@
begin transports
t1:
driver = appendfile
file = DIR/test-mail/$local_part
t1:
driver = appendfile
file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
user = CALLER
transport_filter = /non/existent/file
user = CALLER
transport_filter = /non/existent/file
@@
-41,6
+36,7
@@
t3:
driver = smtp
hosts = 127.0.0.1
port = PORT_S
driver = smtp
hosts = 127.0.0.1
port = PORT_S
+ hosts_try_fastopen = :
allow_localhost
transport_filter = /non/existent/file
allow_localhost
transport_filter = /non/existent/file