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.opendmarc.user;
group = config.services.opendmarc.group;
permissions = "0400";
- text = config.myEnv.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" ];
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;
config.secrets.fullPaths."opendkim/eldiron.private"
];
};
+
+ systemd.services.milter_verify_from = {
+ description = "Verify from milter";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ User = "postfix";
+ Group = "postfix";
+ ExecStart = let python = pkgs.python3.withPackages (p: [ p.pymilter ]);
+ in "${python}/bin/python ${./verify_from.py} -s /run/milter_verify_from/verify_from.sock";
+ RuntimeDirectory = "milter_verify_from";
+ };
+ };
};
}