fanf2 2005/09/22 13:58:14 BST
Modified files:
exim-doc/doc-txt NewStuff
Log:
Improve the ratelimit examples. The delay example was broken - it needed
a time unit after the ${eval}.
Revision Changes Path
1.75 +4 -5 exim/exim-doc/doc-txt/NewStuff
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -u -r1.74 -r1.75
--- NewStuff 22 Sep 2005 12:03:36 -0000 1.74
+++ NewStuff 22 Sep 2005 12:58:14 -0000 1.75
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.74 2005/09/22 12:03:36 fanf2 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.75 2005/09/22 12:58:14 fanf2 Exp $
New Features in Exim
--------------------
@@ -381,13 +381,12 @@
# Log all senders' rates
warn
ratelimit = 0 / 1h / strict
- log_message = \
- Sender rate $sender_rate > $sender_rate_limit / $sender_rate_period
+ log_message = Sender rate $sender_rate / $sender_rate_period
# Slow down fast senders
warn
ratelimit = 100 / 1h / per_rcpt / strict
- delay = ${eval: 10 * ($sender_rate - $sender_rate_limit) }
+ delay = ${eval: $sender_rate - $sender_rate_limit }s
# Keep authenticated users under control
deny
@@ -401,8 +400,8 @@
# Restrict incoming rate from each host, with a default rate limit
# set using a macro and special cases looked up in a table.
defer
- message = Sender rate $sender_rate exceeds \
- $sender_rate_limit messages per $sender_rate_period
+ message = Sender rate exceeds $sender_rate_limit \
+ messages per $sender_rate_period
ratelimit = ${lookup {$sender_host_address} \
cdb {DB/ratelimits.cdb} \
{$value} {RATELIMIT} }
