From 85a4c8e5568ed58ea1048ed5763e15e6fe371e53 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 29 Mar 2024 15:11:03 +0100 Subject: [PATCH] Fixed #6654 Rspamd R_DUMMY Symbol is missing on some systems --- install/lib/installer_base.lib.php | 12 ++++++++++++ install/tpl/rspamd.local.lua.master | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 install/tpl/rspamd.local.lua.master diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 8e6cfca07b..f8facc05a3 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -2098,6 +2098,18 @@ class installer_base extends stdClass { $tpl->setVar('rspamd_password', $rspamd_password); wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab()); chmod('/etc/rspamd/local.d/worker-controller.inc', 0644); + + // rspamd.local.lua + if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd.local.lua.master")) { + exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd.local.lua.master /etc/rspamd/rspamd.local.lua"); + } else { + exec("cp tpl/rspamd.local.lua.master /etc/rspamd/rspamd.local.lua"); + } + if(file_exists('/etc/rspamd/rspamd.local.lua')) { + exec('chgrp _rspamd /etc/rspamd/rspamd.local.lua'); + exec('chmod 640 /etc/rspamd/rspamd.local.lua'); + } + } public function configure_spamassassin() { diff --git a/install/tpl/rspamd.local.lua.master b/install/tpl/rspamd.local.lua.master new file mode 100644 index 0000000000..e0205b8ce6 --- /dev/null +++ b/install/tpl/rspamd.local.lua.master @@ -0,0 +1,7 @@ +rspamd_config.R_DUMMY = { + callback = function(task) + return true + end, + score = 0, + description = 'dummy symbol', +} \ No newline at end of file -- GitLab