commit eb75483: [Conf] Move to options

[Vsevolod Stakhov]

Author: Vsevolod Stakhov
Date: 2018-12-06 15:36:22 +0000
URL: https://github.com/rspamd/rspamd/commit/eb754830077b048542d581e2fb29df4d952078b1

[Conf] Move to options

---
 conf/options.inc       | 3 +++
 conf/worker-normal.inc | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/options.inc b/conf/options.inc
index a75c6341d..108a153e5 100644
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -42,3 +42,6 @@ rrd = "${DBDIR}/rspamd.rrd";
 # Local networks
 local_addrs = [192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, fd00::/8, 169.254.0.0/16, fe80::/10];
 hs_cache_dir = "${DBDIR}/";
+
+# Timeout for messages processing (must be larger than any internal timeout used)
+task_timeout = 8s;
diff --git a/conf/worker-normal.inc b/conf/worker-normal.inc
index 72aef0b84..532455d0a 100644
--- a/conf/worker-normal.inc
+++ b/conf/worker-normal.inc
@@ -1,4 +1,3 @@
 # Included from top-level .conf file
 
 mime = true;
-task_timeout = 8s;