summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-11-01 20:00:00 +0100
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-11-01 20:00:00 +0100
commitfc40493880f5f66be4786df36b05416e915d2d60 (patch)
tree9c280e65f18395801557505b3acb4a28124926e5
parente73b9de22be160c6a4da3a05a933beaa4553b8ed (diff)
downloadnixos-fc40493880f5f66be4786df36b05416e915d2d60.tar
nixos-fc40493880f5f66be4786df36b05416e915d2d60.tar.gz
nixos-fc40493880f5f66be4786df36b05416e915d2d60.tar.bz2
nixos-fc40493880f5f66be4786df36b05416e915d2d60.tar.xz
nixos-fc40493880f5f66be4786df36b05416e915d2d60.zip
move helo restrictions to send
-rw-r--r--ymir.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/ymir.nix b/ymir.nix
index ac70b1c5..c8bbafff 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -405,12 +405,7 @@ in rec {
405 405
406 smtpd_delay_reject = yes 406 smtpd_delay_reject = yes
407 smtpd_helo_required = yes 407 smtpd_helo_required = yes
408 smtpd_helo_restrictions = 408 smtpd_helo_restrictions = permit
409 permit_mynetworks,
410 reject_non_fqdn_helo_hostname,
411 reject_invalid_helo_hostname,
412 reject_unknown_reverse_client_hostname,
413 permit
414 409
415 smtpd_recipient_restrictions = 410 smtpd_recipient_restrictions =
416 reject_unauth_pipelining, 411 reject_unauth_pipelining,
@@ -420,6 +415,9 @@ in rec {
420 check_policy_service unix:private/policy-quota, 415 check_policy_service unix:private/policy-quota,
421 permit_mynetworks, 416 permit_mynetworks,
422 permit_sasl_authenticated, 417 permit_sasl_authenticated,
418 reject_non_fqdn_helo_hostname,
419 reject_invalid_helo_hostname,
420 reject_unknown_reverse_client_hostname,
423 reject_unauth_destination, 421 reject_unauth_destination,
424 check_client_access regexp:${pkgs.writeText "spfpolicy" '' 422 check_client_access regexp:${pkgs.writeText "spfpolicy" ''
425 /(^|\.)tu-muenchen\.de$/ DUNNO 423 /(^|\.)tu-muenchen\.de$/ DUNNO