mirror of
https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git
synced 2025-04-02 05:44:33 +05:00
Merge branch 'rspamd-dmarc-exclude' into 'master'
mail-server: add `dmarcReporting.excludeDomains` See merge request simple-nixos-mailserver/nixos-mailserver!297
This commit is contained in:
commit
4460e1b22d
@ -894,6 +894,14 @@ in
|
|||||||
The sender name for DMARC reports. Defaults to the organization name.
|
The sender name for DMARC reports. Defaults to the organization name.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
excludeDomains = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
List of domains or eSLDs to be excluded from DMARC reports.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
debug = mkOption {
|
debug = mkOption {
|
||||||
|
@ -74,6 +74,9 @@ in
|
|||||||
org_name = "${cfg.dmarcReporting.organizationName}";
|
org_name = "${cfg.dmarcReporting.organizationName}";
|
||||||
from_name = "${cfg.dmarcReporting.fromName}";
|
from_name = "${cfg.dmarcReporting.fromName}";
|
||||||
msgid_from = "dmarc-rua";
|
msgid_from = "dmarc-rua";
|
||||||
|
${lib.optionalString (cfg.dmarcReporting.excludeDomains != []) ''
|
||||||
|
exclude_domains = ${builtins.toJSON cfg.dmarcReporting.excludeDomains};
|
||||||
|
''}
|
||||||
}''}
|
}''}
|
||||||
''; };
|
''; };
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user