git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf
index 9ca3409..f77d8a4 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf
+++ b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf
@@ -18,6 +18,9 @@
"ENCRYPTED_CHAT" {
score = -20.0;
}
+ "SOGO_CONTACT" {
+ score = -99.0;
+ }
}
group "MX" {
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf
index 47373d9..daaa79b 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf
+++ b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf
@@ -16,8 +16,7 @@
backend = "http";
url = "http://nginx:9081/pushover.php";
selector = "mailcow_rcpt";
- # Only return msgid, do not parse the full message
- formatter = "msgid";
+ formatter = "json";
meta_headers = true;
}
}
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural.conf
deleted file mode 100644
index f4658db..0000000
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-rules {
- "LONG" {
- train {
- max_trains = 200;
- max_usages = 20;
- max_iterations = 25;
- learning_rate = 0.01,
- }
- symbol_spam = "NEURAL_SPAM_LONG";
- symbol_ham = "NEURAL_HAM_LONG";
- ann_expire = 45d;
- }
- "SHORT" {
- train {
- max_trains = 100;
- max_usages = 10;
- max_iterations = 15;
- learning_rate = 0.01,
- }
- symbol_spam = "NEURAL_SPAM_SHORT";
- symbol_ham = "NEURAL_HAM_SHORT";
- ann_expire = 7d;
- }
-}
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural_group.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural_group.conf
deleted file mode 100644
index fca5cec..0000000
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural_group.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-symbols = {
- "NEURAL_SPAM_LONG" {
- weight = 3.7; # sample weight
- description = "Neural network spam (long)";
- }
- "NEURAL_HAM_LONG" {
- weight = -4.0; # sample weight
- description = "Neural network ham (long)";
- }
- "NEURAL_SPAM_SHORT" {
- weight = 2.5; # sample weight
- description = "Neural network spam (short)";
- }
- "NEURAL_HAM_SHORT" {
- weight = -2.0; # sample weight
- description = "Neural network ham (short)";
- }
-}