From ed77e1bc75c3e86d608efdbbf6db715d0f325315 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 11 Dec 2017 07:27:30 +0100 Subject: [PATCH] mail/rspamd: merge version 0.2 from master --- mail/rspamd/Makefile | 2 +- .../src/opnsense/service/templates/OPNsense/Rspamd/redis.conf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index fc1f4ea2d..d11381090 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= rspamd -PLUGIN_VERSION= 0.1 +PLUGIN_VERSION= 0.2 PLUGIN_COMMENT= Protect your network from spam PLUGIN_DEPENDS= rspamd PLUGIN_MAINTAINER= franz.fabian.94@gmail.com diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/redis.conf b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/redis.conf index e3b39b780..42e494bc3 100644 --- a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/redis.conf +++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/redis.conf @@ -16,8 +16,7 @@ {% if helpers.exists('OPNsense.Rspamd.general.enable_redis_plugin') and OPNsense.Rspamd.general.enable_redis_plugin == '1' %} {% if helpers.exists('OPNsense.redis.general.enabled') and OPNsense.redis.general.enabled == '1' %} -servers = "::1"; -write_servers = "::1"; +servers = "[::1]{% if helpers.exists('OPNsense.redis.general.port') and OPNsense.redis.general.port != '' %}:{{ OPNsense.redis.general.port }}{% endif %}"; timeout = 10s; #db = "0"; {% if helpers.exists('OPNsense.redis.security.password') and OPNsense.redis.security.password != '' %}