diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-27 17:00:39 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-27 17:00:39 +0100 |
| commit | 14a465c3f0ae93b383f57f12b2ac8709ac0d55b6 (patch) | |
| tree | df75da618ff9850038996f7c998e6068e6e557da /test/confs | |
| parent | 0e941a381173bcd17d96fab5c5c1a5c9b4b82ddc (diff) | |
Further TPDA events
msg:complete
msg:fail:internal
msg:fail:delivery
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/5700 | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/test/confs/5700 b/test/confs/5700 index 0856bb056..65a1b59ba 100644 --- a/test/confs/5700 +++ b/test/confs/5700 @@ -13,6 +13,8 @@ gecos_name = CALLER_NAME acl_smtp_rcpt = accept acl_smtp_data = accept +delivery_event_action = ${acl {logger}} + # ----- ACL ----- @@ -32,11 +34,29 @@ ev_smtp: [$host_address]:$host_port logwrite = . banner <$tpda_data> +ev_msg_fail: + accept condition = ${if eq {$tpda_event}{msg:fail:delivery}} + logwrite = . \ + refused by fdqn <$host> \ + local_part <$local_part> \ + domain <$domain> \ + + accept logwrite = . \ + local_part <$local_part> \ + domain <$domain> \ + reason <$tpda_data> + ev_msg: - accept condition = ${if !eq {$acl_arg2}{domain1}} + accept condition = ${if eq {fail} {${listextract{2}{$tpda_event}}}} + acl = ev_msg_fail + + accept condition = ${if eq {$tpda_event}{msg:complete}} + logwrite = . finished: $message_exim_id + + accept condition = ${if !eq {$domain}{domain1}} logwrite = $this_expansion_will_fail - accept condition = ${if eq {$acl_arg1}{msg:delivery}} + accept condition = ${if eq {$tpda_event}{msg:delivery}} logwrite = . \ delivery \ ip <$host_address> \ @@ -48,7 +68,7 @@ ev_msg: router <$router_name> \ transport <$transport_name> - accept condition = ${if eq {$acl_arg1}{msg:host:defer}} + accept condition = ${if eq {$tpda_event}{msg:host:defer}} logwrite = . \ deferral \ ip <$host_address> \ @@ -68,7 +88,7 @@ logger: accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}} acl = ev_smtp accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}} - acl = ev_msg $tpda_event $acl_arg2 + acl = ev_msg # ----- Routers ----- @@ -97,6 +117,6 @@ smtp: port = PORT_S command_timeout = 1s final_timeout = 1s - tpda_event_action = ${acl {logger} {$tpda_event} {$domain} } + tpda_event_action = ${acl {logger}} # End |