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
testsuite: abstract out common conf settings
[users/heiko/exim.git]
/
test
/
confs
/
5400
diff --git
a/test/confs/5400
b/test/confs/5400
index 09a0aafcf85b33bad8b742e9721641b7ee649fbb..f87f985fd299ce4aa994ada7e093cbfe149e16e9 100644
(file)
--- a/
test/confs/5400
+++ b/
test/confs/5400
@@
-1,12
+1,10
@@
# Exim test configuration 5400
# Exim test configuration 5400
-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
+
+log_selector = +received_recipients
# ----- Main settings -----
# ----- Main settings -----
@@
-27,14
+25,21
@@
ar:
begin routers
begin routers
+dns:
+ driver = dnslookup
+ domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex
+ self = send
+ transport = smtp
+
all:
driver = manualroute
domains = ! +local_domains
all:
driver = manualroute
domains = ! +local_domains
- route_list = * 127.0.0.1
+ route_list =
special.com HOSTIPV4 ;
* 127.0.0.1
self = send
self = send
- transport =
smtp
+ transport =
${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
headers_remove = X-hdr-rtr
headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++
headers_remove = X-hdr-rtr
headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++
+ errors_to = ""
no_more
no_more
@@
-48,5
+53,10
@@
smtp:
port = PORT_S
headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
port = PORT_S
headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
+smtp2:
+ driver = smtp
+ interface = HOSTIPV4
+ port = PORT_S
+
# End
# End