Some fixes to the default configuration

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 386e83e6a67458e5bc2a528911f18c8957189f8d..dfb34844b139d123aaeb0df7a1debe94761ffc1a 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -573,10 +573,15 @@ metric {
            weight = 2.0;
            description = "From address is listed in zen pbl";
        }
+       symbol {
+           name = "RBL_SPAMHAUS_PBL1";
+           weight = 2.0;
+           description = "From address is listed in zen pbl";
+       }
        symbol {
            name = "RECEIVED_SPAMHAUS_XBL";
            weight = 3.0;
-           description = "Received address is listed in zen pbl";
+           description = "Received address is listed in zen xbl";
            one_shot = true;
        }
 
@@ -859,7 +864,7 @@ metric {
 
        symbol {
            weight = 0.0;
-           name = "SEM_URIBL";
+           name = "SEM_URIBL_UNKNONW";
            description = "Spameatingmonkey uribl: unknown result";
        }
        symbol {

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 2d167f65a6156f8aa9451fa3a1baec788fb3b1a2..5e12be77449da0003f367a9b881ab5452a11680b 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -19,7 +19,7 @@ rbl {
                 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";
+                RBL_SPAMHAUS_PBL1 = "127.0.0.11";
             }
         }
 

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index f9bf43ccc08a496fcc926f8221fc47cee81dbac8..556e039f314e9da9ab233ff551bf44f958b709c1 100644 (file)
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -284,7 +284,7 @@ if not opts or type(opts) ~= 'table' then
 end
 
 if not opts['servers'] then
-  rspamd_logger.errx(rspamd_config, 'no servers are specified for dmarc stats')
+  rspamd_logger.infox(rspamd_config, 'no servers are specified for dmarc stats')
 else
   upstreams = upstream_list.create(rspamd_config, opts['servers'], default_port)
   if not upstreams then

diff --git a/src/plugins/lua/ip_score.lua b/src/plugins/lua/ip_score.lua
index a254b544d72fa7c3b44d2ab62be5ae6649ac8f3c..643e4148a76a6a5886712f3eb3e624a8f02a5a6a 100644 (file)
--- a/src/plugins/lua/ip_score.lua
+++ b/src/plugins/lua/ip_score.lua
@@ -346,7 +346,7 @@ local configure_ip_score_module = function()
     if options['servers'] and options['servers'] ~= '' then
       upstreams = upstream_list.create(rspamd_config, options['servers'], default_port)
       if not upstreams then
-        rspamd_logger.errx(rspamd_config, 'no servers are specified')
+        rspamd_logger.infox(rspamd_config, 'no servers are specified')
       end
     end
     if options['whitelist'] then