-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
{
options.myServices.mail.milters.sockets = lib.mkOption {
type = lib.types.attrsOf lib.types.path;
milters sockets
'';
};
- config = lib.mkIf config.myServices.mail.enable {
+ config = lib.mkIf (config.myServices.mail.enable || config.myServices.mailBackup.enable) {
secrets.keys = [
{
dest = "opendkim/eldiron.private";
user = config.services.opendkim.user;
group = config.services.opendkim.group;
permissions = "0400";
- text = myconfig.env.mail.dkim.eldiron.private;
+ text = config.myEnv.mail.dkim.eldiron.private;
}
{
dest = "opendkim/eldiron.txt";
group = config.services.opendkim.group;
permissions = "0444";
text = ''
- eldiron._domainkey IN TXT ${myconfig.env.mail.dkim.eldiron.public}'';
+ eldiron._domainkey IN TXT ${config.myEnv.mail.dkim.eldiron.public}'';
}
{
dest = "opendmarc/ignore.hosts";
user = config.services.opendmarc.user;
group = config.services.opendmarc.group;
permissions = "0400";
- text = myconfig.env.mail.dmarc.ignore_hosts;
+ text = let
+ mxes = lib.attrsets.filterAttrs
+ (n: v: v.mx.enable)
+ config.myEnv.servers;
+ in
+ builtins.concatStringsSep "\n" ([
+ config.myEnv.mail.dmarc.ignore_hosts
+ ] ++ lib.mapAttrsToList (n: v: v.fqdn) mxes);
}
];
users.users."${config.services.opendkim.user}".extraGroups = [ "keys" ];
(e: "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}")
(zone.withEmail or [])
)
- myconfig.env.dns.masterZones
+ config.myEnv.dns.masterZones
));
keyPath = "${config.secrets.location}/opendkim";
selector = "eldiron";
configFile = pkgs.writeText "opendkim.conf" ''
- SubDomains yes
- UMask 002
+ SubDomains yes
+ UMask 002
+ AlwaysAddARHeader yes
'';
group = config.services.postfix.group;
};
configFile = pkgs.writeText "opendmarc.conf" ''
AuthservID HOSTNAME
FailureReports false
- FailureReportsBcc postmaster@localhost.immae.eu
+ FailureReportsBcc postmaster@immae.eu
FailureReportsOnNone true
FailureReportsSentBy postmaster@immae.eu
IgnoreAuthenticatedClients true
IgnoreHosts ${config.secrets.fullPaths."opendmarc/ignore.hosts"}
SoftwareHeader true
+ SPFIgnoreResults true
SPFSelfValidate true
- TrustedAuthservIDs HOSTNAME, immae.eu, nef2.ens.fr
UMask 002
'';
group = config.services.postfix.group;