diff --git a/rspamd-1.5.9.tar.xz b/rspamd-1.5.9.tar.xz deleted file mode 100644 index 3f1f515..0000000 --- a/rspamd-1.5.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87c28c7f5d58853ce001a088bcfceefec747142ff0edbf25dda3e85cbb6ab46c -size 1885508 diff --git a/rspamd-1.6.1.tar.xz b/rspamd-1.6.1.tar.xz new file mode 100644 index 0000000..c479bd3 --- /dev/null +++ b/rspamd-1.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:146dd8343ac95c96465c773de4c645b8b82286a5fe4b8439367bb4c228b12022 +size 1941776 diff --git a/rspamd.changes b/rspamd.changes index 697816b..aa22f86 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jun 14 18:34:59 UTC 2017 - iippolitov@gmail.com + +- updated version to 1.6.1 + +------------------------------------------------------------------- +Tue Jun 13 10:10:53 UTC 2017 - iippolitov@gmail.com + +- updated version to 1.6.0 +- rspamd.conf with logging to console added to sources + ------------------------------------------------------------------- Tue Jun 6 17:30:00 UTC 2017 - iippolitov@gmail.com diff --git a/rspamd.conf b/rspamd.conf new file mode 100644 index 0000000..cd400c9 --- /dev/null +++ b/rspamd.conf @@ -0,0 +1,64 @@ +# System V init adopted top level configuration + +# Please don't modify this file as your changes might be overwritten with +# the next update. +# +# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine +# parameters defined on the top level +# +# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add +# parameters defined on the top level +# +# For specific modules or configuration you can also modify +# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults +# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults +# +# See https://rspamd.com/doc/tutorials/writing_rules.html for details + +.include "$CONFDIR/common.conf" + +options { + pidfile = "$RUNDIR/rspamd.pid"; + .include "$CONFDIR/options.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" +} + +logging { + type = "console"; + systemd = true; + filename = "$LOGDIR/rspamd.log"; + .include "$CONFDIR/logging.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" +} + +worker { + bind_socket = "*:11333"; + .include "$CONFDIR/worker-normal.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc" +} + +worker { + bind_socket = "localhost:11334"; + .include "$CONFDIR/worker-controller.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc" +} + +worker "rspamd_proxy" { + bind_socket = "*:11332"; + .include "$CONFDIR/worker-proxy.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc" +} + +# Local fuzzy storage is disabled by default + +#worker { +# bind_socket = "*:11335"; +# .include "$CONFDIR/worker-fuzzy.inc" +# .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc" +# .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc" +#} diff --git a/rspamd.spec b/rspamd.spec index 940dbed..3e28b17 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -32,13 +32,14 @@ %global _wwwdir /srv/www/webapps Name: rspamd -Version: 1.5.9 +Version: 1.6.1 Release: 0 License: Apache-2.0 Summary: Spam filtering system Url: https://rspamd.com/ Group: Productivity/Networking/Email/Utilities -Source: https://rspamd.com/downloads/rspamd-%{version}.tar.xz +Source0: https://rspamd.com/downloads/rspamd-%{version}.tar.xz +Source1: rspamd.conf BuildRequires: cmake BuildRequires: curl-devel @@ -145,6 +146,7 @@ mkdir -p \ %{buildroot}%{_localstatedir}/lib/rspamd \ %{buildroot}%{_localstatedir}/run/rspamd \ %{buildroot}%{_localstatedir}/log/rspamd + %if %{with systemd} ln -fs %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %endif @@ -161,7 +163,13 @@ cat > %{buildroot}%{_sysconfdir}/%{name}/local.d/worker-controller.inc << EOF #bind_socket = "/run/rspamd/worker-controller.socket mode=0666"; EOF +cat > %{buildroot}%{_sysconfdir}/%{name}/local.d/worker-proxy.inc << EOF +# If the mailer is running on the same host use a unix socket +#bind_socket = "/run/rspamd/worker-proxy.socket mode=0666"; +EOF + install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d +install -p -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rspamd/ %pre %{_sbindir}/groupadd -r %{rspamd_group} 2>/dev/null || : @@ -221,21 +229,22 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %config %{_sysconfdir}/rspamd/options.inc %config %{_sysconfdir}/rspamd/redirectors.inc %config %{_sysconfdir}/rspamd/rspamd.conf -%config %{_sysconfdir}/rspamd/rspamd.systemd.conf -%config %{_sysconfdir}/rspamd/rspamd.sysvinit.conf %config %{_sysconfdir}/rspamd/spf_dkim_whitelist.inc %config %{_sysconfdir}/rspamd/statistic.conf %config %{_sysconfdir}/rspamd/surbl-whitelist.inc %config %{_sysconfdir}/rspamd/worker-controller.inc %config %{_sysconfdir}/rspamd/worker-fuzzy.inc %config %{_sysconfdir}/rspamd/worker-normal.inc +%config %{_sysconfdir}/rspamd/worker-proxy.inc %dir %{_sysconfdir}/rspamd/local.d %config(noreplace) %{_sysconfdir}/rspamd/local.d/worker-controller.inc %config(noreplace) %{_sysconfdir}/rspamd/local.d/worker-normal.inc +%config(noreplace) %{_sysconfdir}/rspamd/local.d/worker-proxy.inc %dir %{_sysconfdir}/rspamd/modules.d %config(noreplace) %{_sysconfdir}/rspamd/modules.d/antivirus.conf +%config(noreplace) %{_sysconfdir}/rspamd/modules.d/arc.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/asn.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/chartable.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/clickhouse.conf @@ -249,6 +258,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %config(noreplace) %{_sysconfdir}/rspamd/modules.d/forged_recipients.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/fuzzy_check.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/greylist.conf +%config(noreplace) %{_sysconfdir}/rspamd/modules.d/history_redis.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/hfilter.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/ip_score.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/maillist.conf @@ -263,12 +273,12 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %config(noreplace) %{_sysconfdir}/rspamd/modules.d/ratelimit.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/rbl.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/redis.conf -%config(noreplace) %{_sysconfdir}/rspamd/modules.d/history_redis.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/regexp.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/replies.conf -%config(noreplace) %{_sysconfdir}/rspamd/modules.d/rmilter_headers.conf +%config(noreplace) %{_sysconfdir}/rspamd/modules.d/milter_headers.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/rspamd_update.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/spamassassin.conf +%config(noreplace) %{_sysconfdir}/rspamd/modules.d/spamtrap.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/spf.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/surbl.conf %config(noreplace) %{_sysconfdir}/rspamd/modules.d/trie.conf @@ -281,14 +291,16 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %dir %{_datadir}/examples %dir %{_datadir}/examples/rspamd -%{_datadir}/examples/rspamd/rspamd.systemd.conf +%{_datadir}/examples/rspamd/rspamd.conf %dir %{_datadir}/rspamd %{_datadir}/rspamd/effective_tld_names.dat %dir %{_datadir}/rspamd/lua %{_datadir}/rspamd/lua/antivirus.lua +%{_datadir}/rspamd/lua/arc.lua %{_datadir}/rspamd/lua/asn.lua +%{_datadir}/rspamd/lua/bayes_expiry.lua %{_datadir}/rspamd/lua/clickhouse.lua %{_datadir}/rspamd/lua/dcc.lua %{_datadir}/rspamd/lua/dkim_signing.lua @@ -300,7 +312,6 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %{_datadir}/rspamd/lua/fann_scores.lua %{_datadir}/rspamd/lua/force_actions.lua %{_datadir}/rspamd/lua/forged_recipients.lua -%{_datadir}/rspamd/lua/fun.lua %{_datadir}/rspamd/lua/fuzzy_collect.lua %{_datadir}/rspamd/lua/greylist.lua %{_datadir}/rspamd/lua/hfilter.lua @@ -318,19 +329,29 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %{_datadir}/rspamd/lua/ratelimit.lua %{_datadir}/rspamd/lua/rbl.lua %{_datadir}/rspamd/lua/replies.lua -%{_datadir}/rspamd/lua/rmilter_headers.lua +%{_datadir}/rspamd/lua/milter_headers.lua %{_datadir}/rspamd/lua/rspamd_update.lua %{_datadir}/rspamd/lua/settings.lua %{_datadir}/rspamd/lua/spamassassin.lua +%{_datadir}/rspamd/lua/spamtrap.lua %{_datadir}/rspamd/lua/trie.lua %{_datadir}/rspamd/lua/url_redirector.lua %{_datadir}/rspamd/lua/url_reputation.lua %{_datadir}/rspamd/lua/url_tags.lua %{_datadir}/rspamd/lua/whitelist.lua +%dir %{_datadir}/rspamd/lib +%{_datadir}/rspamd/lib/auth_results.lua +%{_datadir}/rspamd/lib/dkim_sign_tools.lua +%{_datadir}/rspamd/lib/fun.lua +%{_datadir}/rspamd/lib/global_functions.lua +%{_datadir}/rspamd/lib/lua_redis.lua +%{_datadir}/rspamd/lib/lua_util.lua +%{_datadir}/rspamd/lib/maps.lua +%{_datadir}/rspamd/lib/meta_functions.lua + %dir %{_datadir}/rspamd/rules %{_datadir}/rspamd/rules/forwarding.lua -%{_datadir}/rspamd/rules/global_functions.lua %{_datadir}/rspamd/rules/headers_checks.lua %{_datadir}/rspamd/rules/html.lua %{_datadir}/rspamd/rules/http_headers.lua