Skip to content

Commit a8e9f5f

Browse files
author
Marius Burkard
committed
Merge branch '6167-rspamd-enable-arc-signing' into 'develop'
Resolve "rspamd: enable arc signing" Closes #6167 See merge request ispconfig/ispconfig3!1482
2 parents 1675d18 + 75c5ed1 commit a8e9f5f

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

install/lib/installer_base.lib.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1861,7 +1861,7 @@ public function configure_rspamd() {
18611861
# local.d templates with template tags
18621862
# note: ensure these template files are in server/conf/ and symlinked in install/tpl/
18631863
$local_d = array(
1864-
'dkim_signing.conf',
1864+
'dkim_signing.conf', # dkim_signing.conf no longer uses template tags, could move below
18651865
'options.inc',
18661866
'redis.conf',
18671867
'classifier-bayes.conf',
@@ -1897,6 +1897,7 @@ public function configure_rspamd() {
18971897
'neural_group.conf',
18981898
'users.conf',
18991899
'groups.conf',
1900+
'arc.conf',
19001901
);
19011902
foreach ($local_d as $f) {
19021903
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) {

install/tpl/rspamd_arc.conf.master

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
sign_authenticated = false;
2+
sign_inbound = true;
3+
sign_local = false;
4+
use_domain = "recipient";
5+
try_fallback = false;
6+
use_esld = false;
7+
path_map = "/etc/rspamd/local.d/dkim_domains.map";
8+
selector_map = "/etc/rspamd/local.d/dkim_selectors.map";

0 commit comments

Comments
 (0)