From 2efbc6835d64c490cfb87047554ef7b4541a1e1c Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Mon, 25 Nov 2013 20:48:08 +0200 Subject: Properly check for empty source IP --- src/plugins/lua/rbl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index d46e0a33d..86dba9900 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -78,7 +78,7 @@ local function rbl_cb (task) end local rip = task:get_from_ip() - if(rip ~= "0.0.0.0") then + if(rip:to_string() ~= "0.0.0.0") then for k,rbl in pairs(rbls) do if (rip:get_version() == 6 and rbl['ipv6'] and rbl['from']) or (rip:get_version() == 4 and rbl['ipv4'] and rbl['from']) then -- cgit v1.2.3 From f393274573067b241d41f060911388a8ad31a062 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Mon, 25 Nov 2013 22:40:01 +0200 Subject: Fix date formatting --- centos/rspamd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/centos/rspamd.spec b/centos/rspamd.spec index 801d20939..a4cda52dc 100644 --- a/centos/rspamd.spec +++ b/centos/rspamd.spec @@ -131,10 +131,10 @@ fi %config(noreplace) %{rspamd_confdir}/lua/rspamd.classifiers.lua %changelog -* Tue November 19 2013 Vsevolod Stakhov 0.6.0-1 +* Tue Nov 19 2013 Vsevolod Stakhov 0.6.0-1 - Update to 0.6.0. -* Mon June 10 2013 Vsevolod Stakhov 0.5.6-1 +* Mon Jun 10 2013 Vsevolod Stakhov 0.5.6-1 - Update to 0.5.6. * Sat May 25 2013 Vsevolod Stakhov 0.5.5-1 -- cgit v1.2.3 From b2ff14fb8f7bf0413ff8e6c6a1dac3f4c5e4b62e Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Mon, 25 Nov 2013 23:25:25 +0200 Subject: Add split config files --- centos/rspamd.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/centos/rspamd.spec b/centos/rspamd.spec index a4cda52dc..9465517f9 100644 --- a/centos/rspamd.spec +++ b/centos/rspamd.spec @@ -106,6 +106,13 @@ fi %{_bindir}/rspamd %{_bindir}/rspamc %config(noreplace) %{rspamd_confdir}/%{name}.conf +%config(noreplace) %{rspamd_confdir}/composites.conf +%config(noreplace) %{rspamd_confdir}/logging.conf +%config(noreplace) %{rspamd_confdir}/metrics.conf +%config(noreplace) %{rspamd_confdir}/modules.conf +%config(noreplace) %{rspamd_confdir}/options.conf +%config(noreplace) %{rspamd_confdir}/statistic.conf +%config(noreplace) %{rspamd_confdir}/workers.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{rspamd_logdir} %dir %{rspamd_confdir} -- cgit v1.2.3 From bda563bbf7a7efd2f7b05ad209b4c000bdab3ea1 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Mon, 25 Nov 2013 23:45:45 +0200 Subject: Remove old config --- centos/rspamd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/centos/rspamd.spec b/centos/rspamd.spec index 9465517f9..9ecdfe50a 100644 --- a/centos/rspamd.spec +++ b/centos/rspamd.spec @@ -74,7 +74,6 @@ rm -rf %{buildroot} %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.xml %{__install} -d -p -m 0755 %{buildroot}%{rspamd_logdir} %{__install} -o %{rspamd_user} -g %{rspamd_group} -d -p -m 0755 %{buildroot}%{rspamd_home} -- cgit v1.2.3