From 777e4699584330d58ec6e8cb066eba2522c8bae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Wed, 30 May 2018 20:28:23 +0200
Subject: [PATCH] [ClamAV] Remove deprecated AllowSupplementaryGroups

---
 data/conf/clamav/clamd.conf                   |  1 -
 data/conf/rspamd/local.d/antivirus.conf       |  2 +-
 data/conf/rspamd/local.d/metrics.conf         | 19 ++++---------------
 data/conf/rspamd/local.d/policies_group.conf  |  5 ++++-
 .../conf/rspamd/local.d/statistics_group.conf | 10 ++++++++++
 data/conf/rspamd/override.d/logging.inc       |  1 +
 6 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 data/conf/rspamd/local.d/statistics_group.conf

diff --git a/data/conf/clamav/clamd.conf b/data/conf/clamav/clamd.conf
index 07b0617c3..f09510bd7 100644
--- a/data/conf/clamav/clamd.conf
+++ b/data/conf/clamav/clamd.conf
@@ -15,7 +15,6 @@ MaxQueue 80
 IdleTimeout 20
 SelfCheck 3600
 User clamav
-AllowSupplementaryGroups yes
 Foreground yes
 DetectPUA yes
 # See https://github.com/vrtadmin/clamav-faq/blob/master/faq/faq-pua.md
diff --git a/data/conf/rspamd/local.d/antivirus.conf b/data/conf/rspamd/local.d/antivirus.conf
index 92ba684c9..157c3cb9c 100644
--- a/data/conf/rspamd/local.d/antivirus.conf
+++ b/data/conf/rspamd/local.d/antivirus.conf
@@ -1,5 +1,5 @@
 clamav {
-  attachments_only = false;
+  attachments_only = true;
   symbol = "CLAM_VIRUS";
   type = "clamav";
   log_clean = true;
diff --git a/data/conf/rspamd/local.d/metrics.conf b/data/conf/rspamd/local.d/metrics.conf
index bc9471473..1e5a0fb38 100644
--- a/data/conf/rspamd/local.d/metrics.conf
+++ b/data/conf/rspamd/local.d/metrics.conf
@@ -3,20 +3,12 @@ actions {
 	add_header = 5;
 	greylist = 4;
 }
+
 symbol "MAILCOW_AUTH" {
 	description = "mailcow authenticated";
 	score = -20.0;
 }
-group "statistics" {
-	symbol "BAYES_SPAM" {
-		weight = 7.5;
-		description = "Message probably spam, probability: ";
-	}
-	symbol "BAYES_HAM" {
-		weight = -2.5;
-		description = "Message probably ham, probability: ";
-	}
-}
+
 group "MX" {
 	symbol "MX_INVALID" {
 	  score = 0.5;
@@ -34,15 +26,12 @@ group "MX" {
 	  one_shot = "true";
 	}
 }
+
 symbol "SPOOFED_SENDER" {
 	description = "Sender is not authenticated but part of mailcow managed domains";
 	score = 1.0;
 }
-group "policies" {
-  symbol "R_SPF_FAIL" {
-    score = 4.0;
-  }
-}
+
 symbol "CTYPE_MIXED_BOGUS" {
   score = 0.0;
 }
diff --git a/data/conf/rspamd/local.d/policies_group.conf b/data/conf/rspamd/local.d/policies_group.conf
index 3fcc4d5a9..deaf3f0f5 100644
--- a/data/conf/rspamd/local.d/policies_group.conf
+++ b/data/conf/rspamd/local.d/policies_group.conf
@@ -1,5 +1,8 @@
 symbols = {
     "ARC_REJECT" {
-        weight = 0.0;
+        score = 0.0;
+    }
+    "R_SPF_FAIL" {
+        score = 4.0;
     }
 }
diff --git a/data/conf/rspamd/local.d/statistics_group.conf b/data/conf/rspamd/local.d/statistics_group.conf
new file mode 100644
index 000000000..74e844217
--- /dev/null
+++ b/data/conf/rspamd/local.d/statistics_group.conf
@@ -0,0 +1,10 @@
+symbols = {
+    "BAYES_SPAM" {
+        weight = 7.5;
+        description = "Message probably spam, probability: ";
+    }
+    "BAYES_HAM" {
+        weight = -2.5;
+        description = "Message probably ham, probability: ";
+    }
+}
diff --git a/data/conf/rspamd/override.d/logging.inc b/data/conf/rspamd/override.d/logging.inc
index 23a9f3cf6..3401fec53 100644
--- a/data/conf/rspamd/override.d/logging.inc
+++ b/data/conf/rspamd/override.d/logging.inc
@@ -2,3 +2,4 @@ type = "console";
 systemd = false;
 .include "$CONFDIR/logging.inc"
 .include(try=true; priority=20) "$CONFDIR/override.d/logging.custom.inc"
+debug_modules = ["antivirus"];