From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Fri, 16 Aug 2024 11:45:05 +0000 (+0100)
Subject: [Minor] Restore back one more legacy conversion
X-Git-Tag: 3.10.0~37^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=973beec4a62b941aa9d225eb48e095c41e484de3;p=thirdparty%2Frspamd.git

[Minor] Restore back one more legacy conversion
---

diff --git a/lualib/lua_cfg_transform.lua b/lualib/lua_cfg_transform.lua
index d07ac352d4..265ca34c0d 100644
--- a/lualib/lua_cfg_transform.lua
+++ b/lualib/lua_cfg_transform.lua
@@ -399,6 +399,29 @@ return function(cfg)
     end
   end
 
+  -- Deal with dkim settings
+  if not cfg.dkim then
+    cfg.dkim = {}
+  else
+    if cfg.dkim.sign_condition then
+      -- We have an obsoleted sign condition, so we need to either add dkim_signing and move it
+      -- there or just move sign condition there...
+      if not cfg.dkim_signing then
+        logger.warnx('obsoleted DKIM signing method used, converting it to "dkim_signing" module')
+        cfg.dkim_signing = {
+          sign_condition = cfg.dkim.sign_condition
+        }
+      else
+        if not cfg.dkim_signing.sign_condition then
+          logger.warnx('obsoleted DKIM signing method used, move it to "dkim_signing" module')
+          cfg.dkim_signing.sign_condition = cfg.dkim.sign_condition
+        else
+          logger.warnx('obsoleted DKIM signing method used, ignore it as "dkim_signing" also defines condition!')
+        end
+      end
+    end
+  end
+
   -- Try to find some obvious issues with configuration
   for k, v in cfg:pairs() do
     if v:type() == 'object' and v:at(k) and v:at(k):type() == 'object' then