From 4b9b8cc4c72dc6e7e3db8b7ffadbb13a4e4f8d3f Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 8 Mar 2018 12:34:38 +0000
Subject: [Feature] Add torch conditional to configuration

---
 conf/modules.d/neural.conf | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/modules.d/neural.conf b/conf/modules.d/neural.conf
index f12224d48..296ee2f2a 100644
--- a/conf/modules.d/neural.conf
+++ b/conf/modules.d/neural.conf
@@ -13,7 +13,7 @@
 #
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
-fann_redis {
+neural {
   #servers = 127.0.0.1:6379; # Redis server to store learning data and ANN
 
   train {
@@ -24,9 +24,15 @@ fann_redis {
   }
 
   timeout = 20; # Increase redis timeout
-  enabled = false; # Explicitly disable module
-  use_settings = false; # If enabled, then settings-id could switch this module to another FANN
+  enabled = ${HAS_TORCH}; # Explicitly disable module when torch is disabled
+  use_settings = false; # If enabled, then settings-id is used to dispatch networks
+
+  # Legacy support
   .include(try=true,priority=5) "${DBDIR}/dynamic/fann_redis.conf"
   .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/fann_redis.conf"
   .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/fann_redis.conf"
+
+  .include(try=true,priority=5) "${DBDIR}/dynamic/neural.conf"
+  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/neural.conf"
+  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/neural.conf"
 }
\ No newline at end of file
-- 
cgit v1.2.3