From 3afb1a6d1a8611afd3781fd3c1dd91182f98d25a Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 3 Jun 2013 15:55:45 +0100
Subject: [PATCH] Use specific fuzzy database.

---
 centos/sources/rspamd.xml | 13 +++++++------
 conf/rspamd-basic.xml.in  | 13 +++++++------
 debian/rspamd.xml         | 13 +++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/centos/sources/rspamd.xml b/centos/sources/rspamd.xml
index b3cb1bf18..c710a30f5 100644
--- a/centos/sources/rspamd.xml
+++ b/centos/sources/rspamd.xml
@@ -228,9 +228,9 @@
 
  <!-- Fuzzy lists example -->
  <symbol weight="1.00" description="">R_FUZZY</symbol>
- <symbol weight="1.00" description="">R_FUZZY1</symbol>
- <symbol weight="1.00" description="">R_FUZZY2</symbol>
- <symbol weight="1.00" description="">R_FUZZY3</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_DENIED</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_PROB</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_WHITE</symbol>
 
  <!-- DKIM rules -->
  <symbol weight="1.0" description="DKIM policy reject">R_DKIM_REJECT</symbol>
@@ -310,15 +310,16 @@
 <!-- End of composites section -->
 
 <!-- Workers section -->
+<!--
 <worker>
   <type>fuzzy</type>
   <bind_socket>localhost:11335</bind_socket>
   <count>1</count>
   <maxfiles>2048</maxfiles>
-<!-- Other params -->
     <hashfile>/var/lib/rspamd/fuzzy.db</hashfile>
     <use_judy>yes</use_judy>
 </worker>
+-->
 <worker>
   <type>controller</type>
   <bind_socket>localhost:11334</bind_socket>
@@ -347,12 +348,12 @@
 <!-- Modules section -->
 <!-- fuzzy_check -->
 <module name="fuzzy_check">
-  <servers>localhost:11335</servers>
+  <servers>highsecure.ru:11335</servers>
   <symbol>R_FUZZY</symbol>
   <min_bytes>300</min_bytes>
   <max_score>10</max_score>
   <mime_types>application/pdf</mime_types>
-  <fuzzy_map>1:R_FUZZY1:10,2:R_FUZZY2:5,3:R_FUZZY3:-2.1</fuzzy_map>
+  <fuzzy_map>1:R_FUZZY_DENIED:10,2:R_FUZZY_PROB:5,3:R_FUZZY_WHITE:-2.1</fuzzy_map>
 </module>
 
 
diff --git a/conf/rspamd-basic.xml.in b/conf/rspamd-basic.xml.in
index 06b5ff19d..d7401965a 100644
--- a/conf/rspamd-basic.xml.in
+++ b/conf/rspamd-basic.xml.in
@@ -228,9 +228,9 @@
 
  <!-- Fuzzy lists example -->
  <symbol weight="1.00" description="">R_FUZZY</symbol>
- <symbol weight="1.00" description="">R_FUZZY1</symbol>
- <symbol weight="1.00" description="">R_FUZZY2</symbol>
- <symbol weight="1.00" description="">R_FUZZY3</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_DENIED</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_PROB</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_WHITE</symbol>
 
  <!-- DKIM rules -->
  <symbol weight="1.0" description="DKIM policy reject">R_DKIM_REJECT</symbol>
@@ -310,15 +310,16 @@
 <!-- End of composites section -->
 
 <!-- Workers section -->
+<!--
 <worker>
   <type>fuzzy</type>
   <bind_socket>localhost:11335</bind_socket>
   <count>1</count>
   <maxfiles>2048</maxfiles>
-<!-- Other params -->
     <hashfile>@LOCALSTATES_PREFIX@/fuzzy.db</hashfile>
     <use_judy>yes</use_judy>
 </worker>
+-->
 <worker>
   <type>controller</type>
   <bind_socket>localhost:11334</bind_socket>
@@ -347,12 +348,12 @@
 <!-- Modules section -->
 <!-- fuzzy_check -->
 <module name="fuzzy_check">
-  <servers>localhost:11335</servers>
+  <servers>highsecure.ru:11335</servers>
   <symbol>R_FUZZY</symbol>
   <min_bytes>300</min_bytes>
   <max_score>10</max_score>
   <mime_types>application/pdf</mime_types>
-  <fuzzy_map>1:R_FUZZY1:10,2:R_FUZZY2:5,3:R_FUZZY3:-2.1</fuzzy_map>
+  <fuzzy_map>1:R_FUZZY_DENIED:10,2:R_FUZZY_PROB:5,3:R_FUZZY_WHITE:-2.1</fuzzy_map>
 </module>
 
 
diff --git a/debian/rspamd.xml b/debian/rspamd.xml
index ffed2f06e..0a70da068 100644
--- a/debian/rspamd.xml
+++ b/debian/rspamd.xml
@@ -228,9 +228,9 @@
 
  <!-- Fuzzy lists example -->
  <symbol weight="1.00" description="">R_FUZZY</symbol>
- <symbol weight="1.00" description="">R_FUZZY1</symbol>
- <symbol weight="1.00" description="">R_FUZZY2</symbol>
- <symbol weight="1.00" description="">R_FUZZY3</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_DENIED</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_PROB</symbol>
+ <symbol weight="1.00" description="">R_FUZZY_WHITE</symbol>
 
  <!-- DKIM rules -->
  <symbol weight="1.0" description="DKIM policy reject">R_DKIM_REJECT</symbol>
@@ -310,15 +310,16 @@
 <!-- End of composites section -->
 
 <!-- Workers section -->
+<!--
 <worker>
   <type>fuzzy</type>
   <bind_socket>localhost:11335</bind_socket>
   <count>1</count>
   <maxfiles>2048</maxfiles>
-<!-- Other params -->
     <hashfile>/var/lib/rspamd/fuzzy.db</hashfile>
     <use_judy>yes</use_judy>
 </worker>
+-->
 <worker>
   <type>controller</type>
   <bind_socket>localhost:11334</bind_socket>
@@ -347,12 +348,12 @@
 <!-- Modules section -->
 <!-- fuzzy_check -->
 <module name="fuzzy_check">
-  <servers>localhost:11335</servers>
+  <servers>highsecure.ru:11335</servers>
   <symbol>R_FUZZY</symbol>
   <min_bytes>300</min_bytes>
   <max_score>10</max_score>
   <mime_types>application/pdf</mime_types>
-  <fuzzy_map>1:R_FUZZY1:10,2:R_FUZZY2:5,3:R_FUZZY3:-2.1</fuzzy_map>
+  <fuzzy_map>1:R_FUZZY_DENIED:10,2:R_FUZZY_PROB:5,3:R_FUZZY_WHITE:-2.1</fuzzy_map>
 </module>
 
 
-- 
2.39.5