diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-05-08 13:26:13 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-05-09 14:17:47 +0100 |
| commit | 0cd5fd23fdc042cd634a1033350bf91689f26d3c (patch) | |
| tree | 9278795be8103b01fb86f301d90fd7273eb669ec /test/confs | |
| parent | fa665e0b7252b5916f0fbd57d6ef8c1f0a9b080f (diff) | |
New $queue_name variable
queue_run_max main option expanded, allowing per-queue values
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0001 | 2 | ||||
| -rw-r--r-- | test/confs/0574 | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/test/confs/0001 b/test/confs/0001 index 0daf053bd..0fd7efe44 100644 --- a/test/confs/0001 +++ b/test/confs/0001 @@ -148,7 +148,7 @@ no_queue_only_override queue_only_file = /var/spool/exim/queue_only queue_only_load = 8.2 no_queue_run_in_order -queue_run_max = 5 +queue_run_max = ${if = {1}{1} {5}{10}} queue_smtp_domains = x.y.z receive_timeout = 0s received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}} diff --git a/test/confs/0574 b/test/confs/0574 index 722988a29..289ed1955 100644 --- a/test/confs/0574 +++ b/test/confs/0574 @@ -13,12 +13,21 @@ tls_advertise_hosts = log_selector = +received_recipients +sender_on_delivery -acl_smtp_rcpt = accept queue = ${if eq {normal}{$local_part} {} {$local_part}} +acl_smtp_rcpt = rcpt queue_only queue_run_in_order #--------------- +begin acl + +rcpt: + accept + queue = ${if eq {normal}{$local_part} {} {$local_part}} + logwrite = using queue '$queue_name' + +#--------------- + begin routers all: |