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
Setup for >2 sha methods
[users/jgh/exim.git]
/
test
/
confs
/
5402
diff --git
a/test/confs/5402
b/test/confs/5402
index aff16fad4b6a3467de7fb64152a66c9a0fc1a8e7..e480b64b5c8a53ab9cd6670cd886f8a3c4f6c2f9 100644
(file)
--- a/
test/confs/5402
+++ b/
test/confs/5402
@@
-1,46
+1,53
@@
-# Exim test configuration 540
2
+# Exim test configuration 540
0
exim_path = EXIM_PATH
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
primary_hostname = myhost.test.ex
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
-# ----- Main settings -----
+log_selector = +received_recipients
-log_selector = +smtp_confirmation
-tls_advertise_hosts = *
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+# ----- Main settings -----
domainlist local_domains = test.ex : *.test.ex
domainlist local_domains = test.ex : *.test.ex
-acl_smtp_rcpt =
${if eq {SERVER}{server}{queue}{cutthrough}}
+acl_smtp_rcpt =
ar
-# ----- ACLs -------
-begin acl
+# ----- ACLs -----
-cutthrough:
- accept control = cutthrough_delivery
- verify = recipient
+begin acl
-queue:
- accept control = queue_only
+ar:
+ warn control = cutthrough_delivery
+ logwrite = rcpt for $local_part@$domain
+ warn condition = ${if eq {verify}{$local_part}}
+ verify = recipient/callout=use_sender
+ accept
# ----- Routers -----
begin routers
# ----- 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
- address_data = $local_part
- 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:+++
no_more
no_more
@@
-51,8
+58,13
@@
begin transports
smtp:
driver = smtp
interface = HOSTIPV4
smtp:
driver = smtp
interface = HOSTIPV4
- port = PORT_D
- hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}}
+ 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