commit d6fcb8b: [Minor] Allow to load config with no controller defined
Vsevolod Stakhov
vsevolod at highsecure.ru
Sun Dec 27 21:07:06 UTC 2020
Author: Vsevolod Stakhov
Date: 2020-12-27 21:02:39 +0000
URL: https://github.com/rspamd/rspamd/commit/d6fcb8bd182e9646166ef446a1dfd03eff6417f0 (HEAD -> master)
[Minor] Allow to load config with no controller defined
---
src/libserver/cfg_utils.c | 2 --
test/functional/configs/proxy.conf | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 439a61793..05cc63c4f 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -925,8 +925,6 @@ rspamd_config_post_load (struct rspamd_config *cfg,
msg_warn_config ("controller worker is unconfigured: learning,"
" periodic scripts, maps watching and many other"
" Rspamd features will be broken");
-
- ret = FALSE;
}
ret = rspamd_symcache_validate (cfg->cache, cfg, FALSE) && ret;
diff --git a/test/functional/configs/proxy.conf b/test/functional/configs/proxy.conf
index 01217c113..c2bb3902d 100644
--- a/test/functional/configs/proxy.conf
+++ b/test/functional/configs/proxy.conf
@@ -1,7 +1,10 @@
options = {
- filters = "spf"
+ filters = ["spf", "dkim", "regexp"]
+ url_tld = "${URL_TLD}"
pidfile = "${TMPDIR}/rspamd.pid"
+ lua_path = "${INSTALLROOT}/share/rspamd/lib/?.lua"
dns {
+ nameserver = ["8.8.8.8", "8.8.4.4"];
retransmits = 10;
timeout = 2s;
}
More information about the Commits
mailing list