[Conf] Move to options

diff --git a/conf/options.inc b/conf/options.inc
index a75c6341d8299e49c1d56261bf1e3cdd3b731e26..108a153e5b5a4c32a2b5264fb3e1adf94f14c139 100644 (file)
--- 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 72aef0b84170f120fa65b009369ea09c4bed9325..532455d0ad686f1a5c7cc4b930e0c8df50cccdbf 100644 (file)
--- 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;