diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-05-24 04:39:35 -0400 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-05-24 04:39:35 -0400 |
commit | 65c1efb6371aa762924e4ea6b236f660ffae3492 (patch) | |
tree | d3722b4197cb46a027777e7a56141118c766996a /conf | |
parent | f73f91e1f1f1b9f2825e292af7427aef0c9dac62 (diff) | |
parent | ec54defff21d50b8cfc53c3b0cc641968e9648c6 (diff) | |
download | rspamd-65c1efb6371aa762924e4ea6b236f660ffae3492.tar.gz rspamd-65c1efb6371aa762924e4ea6b236f660ffae3492.zip |
Merge pull request #75 from AlexeySa/patch-2
Remove duplicated rbl rule and fix tabs
Diffstat (limited to 'conf')
-rw-r--r-- | conf/modules.conf | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/conf/modules.conf b/conf/modules.conf index d7f396b47..57ff855c2 100644 --- a/conf/modules.conf +++ b/conf/modules.conf @@ -85,21 +85,21 @@ surbl { rbl { rbls { - spamhaus { - symbol = "RBL_SPAMHAUS"; - rbl = "zen.spamhaus.org"; - ipv6 = true; - returncodes { - RBL_SPAMHAUS_SBL = "127.0.0.2"; - RBL_SPAMHAUS_CSS = "127.0.0.3"; - RBL_SPAMHAUS_XBL = "127.0.0.4"; - RBL_SPAMHAUS_XBL = "127.0.0.5"; - RBL_SPAMHAUS_XBL = "127.0.0.6"; - RBL_SPAMHAUS_XBL = "127.0.0.7"; - RBL_SPAMHAUS_PBL = "127.0.0.10"; - RBL_SPAMHAUS_PBL = "127.0.0.11"; - } - } + spamhaus { + symbol = "RBL_SPAMHAUS"; + rbl = "zen.spamhaus.org"; + ipv6 = true; + returncodes { + RBL_SPAMHAUS_SBL = "127.0.0.2"; + RBL_SPAMHAUS_CSS = "127.0.0.3"; + RBL_SPAMHAUS_XBL = "127.0.0.4"; + RBL_SPAMHAUS_XBL = "127.0.0.5"; + RBL_SPAMHAUS_XBL = "127.0.0.6"; + RBL_SPAMHAUS_XBL = "127.0.0.7"; + RBL_SPAMHAUS_PBL = "127.0.0.10"; + RBL_SPAMHAUS_PBL = "127.0.0.11"; + } + } spamhaus_xbl { symbol = "RECEIVED_SPAMHAUS_XBL"; @@ -133,16 +133,16 @@ rbl { symbol = "RBL_SORBS"; rbl = "dnsbl.sorbs.net"; returncodes { - #http://www.sorbs.net/general/using.shtml - RBL_SORBS_HTTP = "127.0.0.2" - RBL_SORBS_SOCKS = "127.0.0.3" - RBL_SORBS_MISC = "127.0.0.4" - RBL_SORBS_SMTP = "127.0.0.5" - RBL_SORBS_RECENT = "127.0.0.6" - RBL_SORBS_WEB = "127.0.0.7" - RBL_SORBS_DUL = "127.0.0.10" - RBL_SORBS_BLOCK = "127.0.0.8" - RBL_SORBS_ZOMBIE = "127.0.0.9" + #http://www.sorbs.net/general/using.shtml + RBL_SORBS_HTTP = "127.0.0.2" + RBL_SORBS_SOCKS = "127.0.0.3" + RBL_SORBS_MISC = "127.0.0.4" + RBL_SORBS_SMTP = "127.0.0.5" + RBL_SORBS_RECENT = "127.0.0.6" + RBL_SORBS_WEB = "127.0.0.7" + RBL_SORBS_DUL = "127.0.0.10" + RBL_SORBS_BLOCK = "127.0.0.8" + RBL_SORBS_ZOMBIE = "127.0.0.9" } } @@ -186,14 +186,10 @@ once_received { symbol_strict = "ONCE_RECEIVED_STRICT"; symbol = "ONCE_RECEIVED"; } -multimap { - spamhaus { - type = "dnsbl"; - map = "pbl.spamhaus.org"; - symbol = "R_IP_PBL"; - description = "PBL dns block list"; - } -} + +#multimap { +#} + phishing { symbol = "PHISHING"; } |