ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2024-11-11 19:39:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

postfix: Support setting options for policyd-spf

Browse Source
This commit is contained in:
Brian Olsen 2018-05-17 02:01:49 +02:00 committed by Ruben Maher
parent 61df799036
commit 88e292c5b7
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
default.nix
View File

@ -454,6 +454,18 @@ in
''; '';
}; };
policydSPFExtraConfig = mkOption {
type = types.lines;
default = "";
example = ''
skip_addresses = 127.0.0.0/8,::ffff:127.0.0.0/104,::1
'';
description = ''
Extra configuration options for policyd-spf. This can be use to among
other things skip spf checking for some IP addresses.
'';
};
monitoring = { monitoring = {
enable = mkEnableOption "monitoring via monit"; enable = mkEnableOption "monitoring via monit";

14
mail-server/postfix.nix
View File

@ -98,17 +98,9 @@ let
(lib.optional cfg.dkimSigning "unix:/run/opendkim/opendkim.sock") (lib.optional cfg.dkimSigning "unix:/run/opendkim/opendkim.sock")
++ [ "unix:/run/rspamd/rspamd-milter.sock" ]; ++ [ "unix:/run/rspamd/rspamd-milter.sock" ];
policyd-spf = pkgs.writeText "policyd-spf.conf" ('' policyd-spf = pkgs.writeText "policyd-spf.conf" (
TestOnly = 1 cfg.policydSPFExtraConfig
+ (lib.optionalString cfg.debug ''
HELO_reject = Fail
Mail_From_reject = Fail
PermError_reject = False
TempError_Defer = False
skip_addresses = 127.0.0.0/8,::ffff:127.0.0.0/104,::1
'' + (lib.optionalString cfg.debug ''
debugLevel = 4 debugLevel = 4
'')); ''));
in in