public/mail-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swap spaces for commas in submission

Browse Source
This commit is contained in:
niten 2023-09-27 17:01:48 -07:00
parent 6ecc49bd8e
commit da3d7582e2
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
postfix.nix
View File

@ -267,30 +267,6 @@ in {
cfg.blacklist.dns) cfg.blacklist.dns)
++ [ "permit_mynetworks" "permit_sasl_authenticated" "reject" ]; ++ [ "permit_mynetworks" "permit_sasl_authenticated" "reject" ];
submission-sender-restrictions = [
"check_sender_access,${mappedFile "reject_senders"}"
"reject_sender_login_mismatch"
"reject_non_fqdn_sender"
"reject_unknown_sender_domain"
"permit_mynetworks"
"permit_sasl_authenticated"
] ++ (map (blacklist: "reject_rbl_client ${blacklist}")
cfg.blacklist.dns) ++ [ "reject" ];
submission-recipient-restrictions = [
"reject_unknown_sender_domain"
"reject_unknown_recipient_domain"
"reject_unauth_pipelining"
"reject_unauth_destination"
"reject_invalid_hostname"
"reject_non_fqdn_hostname"
"reject_non_fqdn_sender"
"reject_non_fqdn_recipient"
"permit_mynetworks"
"permit_sasl_authenticated"
"reject"
];
client-restrictions = client-restrictions =
[ "permit_sasl_authenticated" "permit_mynetworks" "reject" ]; [ "permit_sasl_authenticated" "permit_mynetworks" "reject" ];
@ -302,6 +278,9 @@ in {
] ++ (map (blacklist: "reject_rbl_client ${blacklist}") ] ++ (map (blacklist: "reject_rbl_client ${blacklist}")
cfg.blacklist.dns) ++ [ "permit" ]; cfg.blacklist.dns) ++ [ "permit" ];
makeRestrictionsString = lst:
concatStringsSep "," (map (line: replaceStrings [ " " ] [ "," ])) lst;
in { in {
enable = true; enable = true;
@ -458,8 +437,7 @@ in {
tls_random_source = "dev:/dev/urandom"; tls_random_source = "dev:/dev/urandom";
}; };
submissionOptions = let makeRestrictionsList = concatStringsSep ","; submissionOptions = {
in {
milter_macro_daemon_name = "ORIGINATING"; milter_macro_daemon_name = "ORIGINATING";
smtpd_helo_required = "yes"; smtpd_helo_required = "yes";
smtpd_tls_security_level = "encrypt"; smtpd_tls_security_level = "encrypt";
@ -468,16 +446,17 @@ in {
smtpd_sasl_path = "/run/dovecot2/auth"; smtpd_sasl_path = "/run/dovecot2/auth";
smtpd_sasl_security_options = "noanonymous"; smtpd_sasl_security_options = "noanonymous";
smtpd_sasl_local_domain = cfg.domain; smtpd_sasl_local_domain = cfg.domain;
smtpd_helo_restrictions = makeRestrictionsList helo-restrictions; smtpd_helo_restrictions = makeRestrictionsString helo-restrictions;
smtpd_client_restrictions = makeRestrictionsList client-restrictions; smtpd_client_restrictions =
smtpd_sender_restrictions = makeRestrictionsList sender-restrictions; makeRestrictionsString client-restrictions;
smtpd_sender_restrictions =
makeRestrictionsString sender-restrictions;
smtpd_recipient_restrictions = smtpd_recipient_restrictions =
makeRestrictionsList submission-recipient-restrictions; makeRestrictionsString recipient-restrictions;
cleanup_service_name = "submission-header-cleanup"; cleanup_service_name = "submission-header-cleanup";
}; };
submissionsOptions = let makeRestrictionsList = concatStringsSep ","; submissionsOptions = {
in {
milter_macro_daemon_name = "ORIGINATING"; milter_macro_daemon_name = "ORIGINATING";
smtpd_helo_required = "yes"; smtpd_helo_required = "yes";
smtpd_tls_security_level = "encrypt"; smtpd_tls_security_level = "encrypt";
@ -486,11 +465,13 @@ in {
smtpd_sasl_path = "/run/dovecot2/auth"; smtpd_sasl_path = "/run/dovecot2/auth";
smtpd_sasl_security_options = "noanonymous"; smtpd_sasl_security_options = "noanonymous";
smtpd_sasl_local_domain = cfg.domain; smtpd_sasl_local_domain = cfg.domain;
smtpd_helo_restrictions = makeRestrictionsList helo-restrictions; smtpd_helo_restrictions = makeRestrictionsString helo-restrictions;
smtpd_client_restrictions = makeRestrictionsList client-restrictions; smtpd_client_restrictions =
smtpd_sender_restrictions = makeRestrictionsList sender-restrictions; makeRestrictionsString client-restrictions;
smtpd_sender_restrictions =
makeRestrictionsString sender-restrictions;
smtpd_recipient_restrictions = smtpd_recipient_restrictions =
makeRestrictionsList submission-recipient-restrictions; makeRestrictionsString recipient-restrictions;
cleanup_service_name = "submission-header-cleanup"; cleanup_service_name = "submission-header-cleanup";
}; };