From 75c5ed1b3318c3cf7a9c76767b4af83dad9366a1 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Wed, 12 May 2021 16:38:45 -0600
Subject: [PATCH] rspamd: enable arc signing incoming mail

---
 install/lib/installer_base.lib.php | 3 ++-
 install/tpl/rspamd_arc.conf.master | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 install/tpl/rspamd_arc.conf.master

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 622674267c..4165551108 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1861,7 +1861,7 @@ class installer_base {
 		# local.d templates with template tags
 		# note: ensure these template files are in server/conf/ and symlinked in install/tpl/
 		$local_d = array(
-			'dkim_signing.conf',
+			'dkim_signing.conf',	# dkim_signing.conf no longer uses template tags, could move below
 			'options.inc',
 			'redis.conf',
 			'classifier-bayes.conf',
@@ -1897,6 +1897,7 @@ class installer_base {
 			'neural_group.conf',
 			'users.conf',
 			'groups.conf',
+			'arc.conf',
 		);
 		foreach ($local_d as $f) {
 			if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) {
diff --git a/install/tpl/rspamd_arc.conf.master b/install/tpl/rspamd_arc.conf.master
new file mode 100644
index 0000000000..781f83ccb2
--- /dev/null
+++ b/install/tpl/rspamd_arc.conf.master
@@ -0,0 +1,8 @@
+sign_authenticated = false;
+sign_inbound = true;
+sign_local = false;
+use_domain = "recipient";
+try_fallback = false;
+use_esld = false;
+path_map = "/etc/rspamd/local.d/dkim_domains.map";
+selector_map = "/etc/rspamd/local.d/dkim_selectors.map";
-- 
GitLab