From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 16 Jan 2016 21:58:26 +0000 (+0000)
Subject: Some fixes to the default configuration
X-Git-Tag: 1.1.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1deaf3b4e9e49ef4cb20dbcb05b2e749cb6168cc;p=thirdparty%2Frspamd.git

Some fixes to the default configuration
---

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 386e83e6a6..dfb34844b1 100644
--- 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 2d167f65a6..5e12be7744 100644
--- 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 f9bf43ccc0..556e039f31 100644
--- 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 a254b544d7..643e4148a7 100644
--- 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