diff options
| -rw-r--r-- | conf/metrics.conf | 29 | ||||
| -rw-r--r-- | conf/modules.conf | 10 |
2 files changed, 29 insertions, 10 deletions
diff --git a/conf/metrics.conf b/conf/metrics.conf index 34ae60ec0..df69919eb 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -520,33 +520,33 @@ metric { symbol { name = "RCVD_IN_DNSWL"; weight = 0.0; - description = "Sender listed at http://www.dnswl.org"; + description = "Unrecognised result from dnswl.org"; } symbol { name = "RCVD_IN_DNSWL_NONE"; - weight = -0.05; + weight = 0.0; description = "Sender listed at http://www.dnswl.org, low none"; } symbol { name = "RCVD_IN_DNSWL_LOW"; - weight = -0.1; + weight = 0.0; description = "Sender listed at http://www.dnswl.org, low trust"; } symbol { name = "RCVD_IN_DNSWL_MED"; - weight = -1.0; + weight = 0.0; description = "Sender listed at http://www.dnswl.org, medium trust"; } symbol { name = "RCVD_IN_DNSWL_HI"; - weight = -5.0; + weight = 0.0; description = "Sender listed at http://www.dnswl.org, high trust"; } symbol { name = "RBL_SPAMHAUS"; weight = 0.0; - description = "From address is listed in zen"; + description = "Unrecognised result from Spamhaus zen"; } symbol { name = "RBL_SPAMHAUS_SBL"; @@ -578,7 +578,7 @@ metric { symbol { name = "RWL_SPAMHAUS_WL"; weight = 0.0; - description = "Sender listed at Spamhaus whitelist"; + description = "Unrecognised result from Spamhaus whitelist"; } symbol { name = "RWL_SPAMHAUS_WL_IND"; @@ -616,7 +616,16 @@ metric { description = "From address is listed in UCEPROTECT LEVEL1 BL"; name = "RBL_UCEPROTECT_LEVEL1"; } - + symbol { + name = "RBL_MAILSPIKE"; + weight = 0.0; + description = "Unrecognised result from Mailspike blacklist"; + } + symbol { + name = "RWL_MAILSPIKE"; + weight = 0.0; + description = "Unrecognised result from Mailspike blacklist"; + } symbol { name = "RBL_MAILSPIKE_ZOMBIE"; weight = 2.0; @@ -659,9 +668,9 @@ metric { } symbol { - weight = 1.0; + weight = 0.0; name = "RBL_SORBS"; - description = "From address is listed in SORBS RBL"; + description = "Unrecognised result from SORBS RBL"; } symbol { weight = 2.5; diff --git a/conf/modules.conf b/conf/modules.conf index 4a6f296e5..a767e32ba 100644 --- a/conf/modules.conf +++ b/conf/modules.conf @@ -123,6 +123,7 @@ rbl { symbol = "RBL_SPAMHAUS"; rbl = "zen.spamhaus.org"; ipv6 = true; + unknown = true; returncodes { RBL_SPAMHAUS_SBL = "127.0.0.2"; RBL_SPAMHAUS_CSS = "127.0.0.3"; @@ -148,6 +149,7 @@ rbl { rbl = "swl.spamhaus.org"; ipv6 = true; is_whitelist = true; + unknown = true; whitelist_exception = "RWL_SPAMHAUS_WL"; returncodes { RWL_SPAMHAUS_WL_IND = "127.0.2.2"; @@ -158,6 +160,8 @@ rbl { } mailspike_bl { + symbol = "RBL_MAILSPIKE"; + unknown = true; rbl = "bl.mailspike.net"; returncodes { RBL_MAILSPIKE_ZOMBIE = "127.0.0.2"; @@ -168,8 +172,11 @@ rbl { } mailspike_wl { + symbol = "RWL_MAILSPIKE"; rbl = "wl.mailspike.net"; is_whitelist = true; + unknown = true; + whitelist_exception = "RWL_MAILSPIKE"; whitelist_exception = "RWL_MAILSPIKE_POSSIBLE"; returncodes { RWL_MAILSPIKE_POSSIBLE = "127.0.0.17"; @@ -197,6 +204,7 @@ rbl { sorbs { symbol = "RBL_SORBS"; rbl = "dnsbl.sorbs.net"; + unknown = true; returncodes { # http:// www.sorbs.net/general/using.shtml RBL_SORBS_HTTP = "127.0.0.2"; @@ -228,6 +236,8 @@ rbl { rbl = "list.dnswl.org"; ipv6 = true; is_whitelist = true; + unknown = true; + whitelist_exception = "RCVD_IN_DNSWL"; whitelist_exception = "DNSWL_BLOCKED"; returncodes { RCVD_IN_DNSWL_NONE = "127.0.%d+.0"; |