From 5f89b665417c03089d24dd0c9fa7e476b7987f90 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Fri, 5 Feb 2021 21:11:09 +0000
Subject: [PATCH] Remove fuzzy worker, unused

---
 configs/rspamd/APKBUILD                 | 10 +++-----
 configs/rspamd/modules/fuzzy_check.conf | 33 -------------------------
 configs/rspamd/rspamd.conf              |  3 +--
 configs/rspamd/workers.conf             |  7 +++---
 4 files changed, 9 insertions(+), 44 deletions(-)
 delete mode 100644 configs/rspamd/modules/fuzzy_check.conf

diff --git a/configs/rspamd/APKBUILD b/configs/rspamd/APKBUILD
index 82e4e2e..76472b1 100644
--- a/configs/rspamd/APKBUILD
+++ b/configs/rspamd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-config-rspamd
-pkgver=2021.01.27
-pkgrel=1
+pkgver=2021.02.05
+pkgrel=0
 pkgdesc="RSpamD configuration"
 url="https://git.redxen.eu/RedXen"
 arch="noarch"
@@ -22,7 +22,6 @@ _modules="
 	chartable
 	dkim
 	dmarc
-	fuzzy_check
 	greylist
 	maillist
 	milter_headers
@@ -61,13 +60,12 @@ a3849ae55a68c90afd913ed18f6b210803f5dbaa2beab5abf23a84b9b4bcb48e617023123724222c
 932c0dc5ae47ecc470c0a5eb684c5d24f95a75dec09e4ee3e191b0cfa274a4a9e343ed012afeb83d405df802792f9c5a3ad11c73bb933d40210c9e149314c12b  milter_headers.conf
 08966d0a3c077a12a1113f774e11d51d3c7d04bb45914e295324e8aa51c3d75b55395c256a905c6d9ae1e98a004a9e6b3b37d36fce810a426dd5d90408331c0a  maillist.conf
 8660fd01589476bbc01bbe75bed392faa55f55fa9b6fea77be79f339cefb43ddbacdbe193ad136c42da91d4ef7f1e1ec40fc5f8f4f398d04bcebf51d5a59ad1f  greylist.conf
-227f215b4e65bff86428502425f1295b21e0f6e8c4b990e4f19aa8e1bb3f1cee18d1b8644e1223edb606292c786e814acc68d276562c8fb4f23fdce6b538689a  fuzzy_check.conf
 e14c3683b48dde5584cbcd0bd5811f6111a201635dd7400d7703003b4c98255d10be9b64ee81784c1fe1df50159e12d6777086c5a18ee9b14be852d233cf6dc5  dmarc.conf
 ad3fa5e3c4c3d7b882c9e85bdde3b1949a32f2f2c9dd43e38977d828e7b6740d31002c502f24a0ea2e27105d5a6b1af7b7140c5d8e306f90c3f7d28c1e4607d5  dkim.conf
 dcec5c53bd29c345ed5c47727af9a8d11328cc8f69ae61064ba3b053ee306baa79b747067097b2354a1fecd6e6527d56d14c79be22c94531f2a5ddc41ce3ca7e  chartable.conf
-8d7978390a97ab7c3a07d38e6a8e9834f073051a7779b29f79cbcafe73ff2084d3260f75ae11ce20b7c8fa5bb9f888f37dfccd67d244f194ed9cc08fc329c704  rspamd.conf
+b8c31e4679846f724e183d40cfab43b1174c3370991ead1a7198a39ec80fc85dff9fb3c823f793d3535f6eb2ae6373db380c5b84370eae1e7e15142fb968d8c6  rspamd.conf
 667ec0331c811730e096e27f5e8659062239f46e3ccd148411984bb4d83b8770cc0d7d3c74dd5a2da71781e9b99d4bcb5a700cbd5f56ae8e17f7c4e50519ffb2  composites.conf
 4ea651877607573126a731619801458798c1e8e4de3522462af4c71adc38141d09a0c75c2c83a33698e3c51095d0b7d364e1ceb3aa534a4157106370a7800e4a  groups.conf
 78df39cbc6e09cdc5e01d27e123d82aa677a70a6f5d59ba0be8d0ce6af012c5311e4a2527e4fbc586f9cdd8da033e9f05e2371970fa23db60eaa8c16c8e85f05  logging.conf
 2d27d5ac1800ee28948f8fcc276cc5c62c97a19d01dde2263eadf3ec4f8eb3bbb8417f4271324c5cfbf1ebd60759aa9047849ea803da96c8632c21966b794e6c  statistic.conf
-778d3a4fe52faad2ab82e53d331907db017428f969ad8e593728d046d6318f157e50e54eedd0b78f96e4ebd932c3e3a9457a0f8c18cedb2ef6413b2ea3456d7d  workers.conf"
+61a0da877f34aadb83ceece960e07aabf2312d7105c7574bec6f8bc9e7989bf28806159330e9d47850afa679a9d48b9101fd6b3ba04f0a614b0c66d95ccd6605  workers.conf"
diff --git a/configs/rspamd/modules/fuzzy_check.conf b/configs/rspamd/modules/fuzzy_check.conf
deleted file mode 100644
index 7b3699b..0000000
--- a/configs/rspamd/modules/fuzzy_check.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-fuzzy_check {
-	min_bytes = 1k; # Since small parts and small attachments causes too many FP
-	timeout = 2s;
-	retransmits = 1;
-	rule "rspamd.com" {
-		algorithm = "mumhash";
-		servers = "round-robin:fuzzy1.rspamd.com:11335,fuzzy2.rspamd.com:11335";
-		encryption_key = "icy63itbhhni8bq15ntp5n5symuixf73s1kpjh6skaq4e7nx5fiy";
-		symbol = "FUZZY_UNKNOWN";
-		mime_types = ["*"];
-		max_score = 20.0;
-		read_only = yes;
-		skip_unknown = yes;
-		short_text_direct_hash = true; # If less than min_length then use direct hash
-		min_length = 64; # Minimum words count to consider shingles
-		fuzzy_map = {
-			FUZZY_DENIED {
-				max_score = 20.0;
-				flag = 1;
-			}
-			FUZZY_PROB {
-				max_score = 10.0;
-				flag = 2;
-			}
-			FUZZY_WHITE {
-				max_score = 2.0;
-				flag = 3;
-			}
-		}
-	}
-	# Include dynamic conf for the rule
-	.include(try=true,priority=5) "${DBDIR}/dynamic/fuzzy_check.conf"
-}
diff --git a/configs/rspamd/rspamd.conf b/configs/rspamd/rspamd.conf
index 09c590a..9fb422c 100644
--- a/configs/rspamd/rspamd.conf
+++ b/configs/rspamd/rspamd.conf
@@ -22,9 +22,8 @@ options {
 		"Content-Type",
 		"X-MimeOLE",
 	];
-	control_socket = "$DBDIR/rspamd.sock mode=0600";
 	history_rows = 200;
-	explicit_modules = ["settings", "bayes_expiry"];
+	explicit_modules = ["settings"];
 
 	# Scan messages even if they are not MIME
 	allow_raw_input = true;
diff --git a/configs/rspamd/workers.conf b/configs/rspamd/workers.conf
index e16eb2a..d1b0bbe 100644
--- a/configs/rspamd/workers.conf
+++ b/configs/rspamd/workers.conf
@@ -1,6 +1,6 @@
 worker "normal" {
 	count = 1;
-	bind_socket = "*:7511";
+	bind_socket = "localhost:7511";
 	mime = true;
 }
 
@@ -27,8 +27,9 @@ worker "rspamd_proxy" {
 }
 
 worker "fuzzy" {
-	count = 1;
-	bind_socket = "*:7513";
+	enabled = false;
+	count = -1;
+	bind_socket = "localhost:7513";
 	backend = "redis";
 	expire = 90d;
 	allow_update = [];