|
|
@@ -301,8 +301,29 @@ return function(cfg) |
|
|
|
end |
|
|
|
|
|
|
|
-- Deal with dkim settings |
|
|
|
if not cfg.dkim then cfg.dkim = {} end |
|
|
|
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 |
|
|
|
|
|
|
|
-- Again: legacy stuff :( |
|
|
|
if not cfg.dkim.sign_headers then |
|
|
|
local sec = cfg.dkim_signing |
|
|
|
if sec and sec[1] then sec = cfg.dkim_signing[1] end |