mailserver: Remove rejectSenders
This can now be handled by rspamd.
This commit is contained in:
parent
d51558f951
commit
5ce610b344
|
@ -29,7 +29,6 @@
|
||||||
domain = "sbruder.de";
|
domain = "sbruder.de";
|
||||||
};
|
};
|
||||||
users = import ./secrets/mail-users.nix;
|
users = import ./secrets/mail-users.nix;
|
||||||
rejectSenders = import ./secrets/mail-reject-senders.nix;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -79,15 +79,6 @@ in
|
||||||
"/^\\s*X-Originating-IP:/"
|
"/^\\s*X-Originating-IP:/"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
rejectSenders = mkOption {
|
|
||||||
type = listOf str;
|
|
||||||
description = "A list of senders to reject mails from";
|
|
||||||
default = [ ];
|
|
||||||
example = [
|
|
||||||
"newsletter@example.com"
|
|
||||||
"spammer@example.com"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -28,13 +28,6 @@ let
|
||||||
|
|
||||||
valiases = pkgs.writeText "valiases" aliasesString;
|
valiases = pkgs.writeText "valiases" aliasesString;
|
||||||
|
|
||||||
access_sender = pkgs.writeText
|
|
||||||
"access_sender"
|
|
||||||
(lib.concatMapStringsSep
|
|
||||||
"\n"
|
|
||||||
(sender: "${sender} REJECT")
|
|
||||||
cfg.rejectSenders);
|
|
||||||
|
|
||||||
submissionHeaderCleanupRules = pkgs.writeText "submission_header_cleanup_rules"
|
submissionHeaderCleanupRules = pkgs.writeText "submission_header_cleanup_rules"
|
||||||
(lib.concatMapStringsSep
|
(lib.concatMapStringsSep
|
||||||
"\n"
|
"\n"
|
||||||
|
@ -57,7 +50,7 @@ lib.mkIf cfg.enable {
|
||||||
recipientDelimiter = "+";
|
recipientDelimiter = "+";
|
||||||
|
|
||||||
mapFiles = {
|
mapFiles = {
|
||||||
inherit access_sender valiases;
|
inherit valiases;
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
@ -86,7 +79,6 @@ lib.mkIf cfg.enable {
|
||||||
];
|
];
|
||||||
|
|
||||||
smtpd_sender_restrictions = listToString [
|
smtpd_sender_restrictions = listToString [
|
||||||
"check_sender_access hash:/var/lib/postfix/conf/access_sender"
|
|
||||||
"reject_non_fqdn_sender"
|
"reject_non_fqdn_sender"
|
||||||
"reject_unknown_sender_domain"
|
"reject_unknown_sender_domain"
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue