From: Adam D. Barratt Date: Fri, 27 Sep 2019 13:37:54 +0000 (+0100) Subject: eximconf: log the current rate at which penalised senders are sending X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d22b9d5e3d4e4a8ac85339b87a66792de597a8c5;p=mirror%2Fdsa-puppet.git eximconf: log the current rate at which penalised senders are sending The use of the "strict" modifier ensures that the count is always updated. The default "leaky" mode stops updating the count once the limit has been reached. Signed-off-by: Adam D. Barratt --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 9d29cff8f..036f7177f 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -687,6 +687,12 @@ check_recipient: deny condition = ${if !eq {$acl_m_prf}{PopconMail}} !verify = sender + warn !hosts = +debianhosts + condition = ${if !eq {$acl_m_prf}{PopconMail}} + condition = ${if >{${eval:$acl_c_scr+0}}{0}} + ratelimit = 10 / 60m / per_rcpt / strict / $sender_host_address + log_message = Sender rate $sender_rate / $sender_rate_period (limit: $sender_rate_limit) + defer !hosts = +debianhosts condition = ${if !eq {$acl_m_prf}{PopconMail}} condition = ${if >{${eval:$acl_c_scr+0}}{0}}