From: Vsevolod Stakhov Date: Mon, 6 Jan 2014 11:42:17 +0000 (+0000) Subject: Several fixes. X-Git-Tag: 0.6.7~16 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c97b00cd6615e0bcf8f9703a669586c0337be5d3;p=rspamd.git Several fixes. --- diff --git a/doc/markdown/configuration/settings.md b/doc/markdown/configuration/settings.md index a87e6141d..94eba112f 100644 --- a/doc/markdown/configuration/settings.md +++ b/doc/markdown/configuration/settings.md @@ -18,7 +18,7 @@ The settings file itself should contain a single section called "settings": ~~~nginx settings { some_users { - priority = 0; + priority = high; from = "@example.com"; rcpt = "admin"; rcpt = "/user.*/"; @@ -33,7 +33,7 @@ settings { } } whitelist { - priority = 1; + priority = low; rcpt = "postmaster@example.com"; want_spam = yes; } @@ -43,7 +43,7 @@ settings { So each setting has the following attributes: - `name` - section name that identify this specific setting (e.g. `some_users`) -- `priority` - 0 or 1, 0 is higher priority than 1 and is matched first (default priority is 1) +- `priority` - high or low, high priority rules are matched first (default priority is low) - `match list` - list of rules when this rule matches: + `from` - match SMTP from + `rcpt` - match RCPT diff --git a/doc/markdown/configuration/settings.png b/doc/markdown/configuration/settings.png index c41450864..2fbec2777 100644 Binary files a/doc/markdown/configuration/settings.png and b/doc/markdown/configuration/settings.png differ