From b04c0927bb46f1b23b699aa94dd197adec4dce41 Mon Sep 17 00:00:00 2001 From: Jesse Norell Date: Mon, 15 Mar 2021 12:36:43 -0600 Subject: [PATCH] fix rspamd whitelist template names --- install/lib/installer_base.lib.php | 8 ++++---- ...t.inc.master => rspamd_dkim_whitelist.inc.ispc.master} | 0 ....inc.master => rspamd_dmarc_whitelist.inc.ispc.master} | 0 ...c.master => rspamd_spf_dkim_whitelist.inc.ispc.master} | 0 ...st.inc.master => rspamd_spf_whitelist.inc.ispc.master} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename install/tpl/{rspamd_dkim_whitelist.inc.master => rspamd_dkim_whitelist.inc.ispc.master} (100%) rename install/tpl/{rspamd_dmarc_whitelist.inc.master => rspamd_dmarc_whitelist.inc.ispc.master} (100%) rename install/tpl/{rspamd_spf_dkim_whitelist.inc.master => rspamd_spf_dkim_whitelist.inc.ispc.master} (100%) rename install/tpl/{rspamd_spf_whitelist.inc.master => rspamd_spf_whitelist.inc.ispc.master} (100%) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 6de768f7e5..768ff43363 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1881,10 +1881,10 @@ class installer_base { # local.d/maps.d templates without template tags $maps_d = array( - 'dkim_whitelist.inc', - 'dmarc_whitelist.inc', - 'spf_dkim_whitelist.inc', - 'spf_whitelist.inc', + 'dkim_whitelist.inc.ispc', + 'dmarc_whitelist.inc.ispc', + 'spf_dkim_whitelist.inc.ispc', + 'spf_whitelist.inc.ispc', ); foreach ($maps_d as $f) { if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd_${f}.master")) { diff --git a/install/tpl/rspamd_dkim_whitelist.inc.master b/install/tpl/rspamd_dkim_whitelist.inc.ispc.master similarity index 100% rename from install/tpl/rspamd_dkim_whitelist.inc.master rename to install/tpl/rspamd_dkim_whitelist.inc.ispc.master diff --git a/install/tpl/rspamd_dmarc_whitelist.inc.master b/install/tpl/rspamd_dmarc_whitelist.inc.ispc.master similarity index 100% rename from install/tpl/rspamd_dmarc_whitelist.inc.master rename to install/tpl/rspamd_dmarc_whitelist.inc.ispc.master diff --git a/install/tpl/rspamd_spf_dkim_whitelist.inc.master b/install/tpl/rspamd_spf_dkim_whitelist.inc.ispc.master similarity index 100% rename from install/tpl/rspamd_spf_dkim_whitelist.inc.master rename to install/tpl/rspamd_spf_dkim_whitelist.inc.ispc.master diff --git a/install/tpl/rspamd_spf_whitelist.inc.master b/install/tpl/rspamd_spf_whitelist.inc.ispc.master similarity index 100% rename from install/tpl/rspamd_spf_whitelist.inc.master rename to install/tpl/rspamd_spf_whitelist.inc.ispc.master -- GitLab