From ad1f243667f50ff3da91f665f9bc7812b64b4e59 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 5 Jan 2020 11:20:55 +0100
Subject: [PATCH] [Postfix] Set CA path for smtpd [Rspamd] Split deprecated
 metrics.conf to actions.conf and groups.conf

---
 data/conf/postfix/main.cf             |  1 +
 data/conf/rspamd/local.d/actions.conf |  3 +++
 data/conf/rspamd/local.d/groups.conf  | 30 ++++++++++++++++++++++
 data/conf/rspamd/local.d/metrics.conf | 36 ---------------------------
 4 files changed, 34 insertions(+), 36 deletions(-)
 create mode 100644 data/conf/rspamd/local.d/actions.conf
 create mode 100644 data/conf/rspamd/local.d/groups.conf
 delete mode 100644 data/conf/rspamd/local.d/metrics.conf

diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf
index 3db43115..3ad04a23 100644
--- a/data/conf/postfix/main.cf
+++ b/data/conf/postfix/main.cf
@@ -104,6 +104,7 @@ relay_domains = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_relay_domain_map
 relay_recipient_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_relay_recipient_maps.cf
 sender_dependent_default_transport_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sender_dependent_default_transport_maps.cf
 smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
+smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
 smtp_tls_cert_file = /etc/ssl/mail/cert.pem
 smtp_tls_key_file = /etc/ssl/mail/key.pem
 smtp_tls_loglevel = 1
diff --git a/data/conf/rspamd/local.d/actions.conf b/data/conf/rspamd/local.d/actions.conf
new file mode 100644
index 00000000..3de63a54
--- /dev/null
+++ b/data/conf/rspamd/local.d/actions.conf
@@ -0,0 +1,3 @@
+reject = 15;
+add_header = 8;
+greylist = 7;
diff --git a/data/conf/rspamd/local.d/groups.conf b/data/conf/rspamd/local.d/groups.conf
new file mode 100644
index 00000000..c72740a6
--- /dev/null
+++ b/data/conf/rspamd/local.d/groups.conf
@@ -0,0 +1,30 @@
+symbol "MAILCOW_AUTH" {
+  description = "mailcow authenticated";
+  score = -20.0;
+}
+
+group "MX" {
+  symbol "MX_INVALID" {
+    score = 0.5;
+    description = "No connectable MX";
+    one_shot = true;
+  }
+  symbol "MX_MISSING" {
+    score = 2.0;
+    description = "No MX record";
+    one_shot = true;
+  }
+  symbol "MX_GOOD" {
+    score = -0.01;
+    description = "MX was ok";
+    one_shot = true;
+  }
+}
+
+symbol "CTYPE_MIXED_BOGUS" {
+  score = 0.0;
+}
+
+symbol "BAD_REP_POLICIES" {
+  score = 2.5;
+}
diff --git a/data/conf/rspamd/local.d/metrics.conf b/data/conf/rspamd/local.d/metrics.conf
deleted file mode 100644
index 00513d22..00000000
--- a/data/conf/rspamd/local.d/metrics.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-actions {
-	reject = 15;
-	add_header = 8;
-	greylist = 7;
-}
-
-symbol "MAILCOW_AUTH" {
-	description = "mailcow authenticated";
-	score = -20.0;
-}
-
-group "MX" {
-	symbol "MX_INVALID" {
-	  score = 0.5;
-	  description = "No connectable MX";
-	  one_shot = true;
-	}
-	symbol "MX_MISSING" {
-	  score = 2.0;
-	  description = "No MX record";
-	  one_shot = true;
-	}
-	symbol "MX_GOOD" {
-	  score = -0.01;
-	  description = "MX was ok";
-	  one_shot = true;
-	}
-}
-
-symbol "CTYPE_MIXED_BOGUS" {
-  score = 0.0;
-}
-
-symbol "BAD_REP_POLICIES" {
-  score = 2.5;
-}