makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master' into 22.11

Browse source
This commit is contained in:
lassulus 2022-12-06 13:51:12 +01:00
parent 45ce420a0c 2f17a36ab5
commit 68ef6e07e3
1 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
krebs/3modules/exim-smarthost.nix
View file

@ -123,10 +123,12 @@ let
# XXX We abuse local_domains to mean "domains, we're the gateway for". # XXX We abuse local_domains to mean "domains, we're the gateway for".
domainlist local_domains = ${concatStringsSep ":" cfg.local_domains} domainlist local_domains = ${concatStringsSep ":" cfg.local_domains}
domainlist relay_to_domains = ${concatStringsSep ":" cfg.relay_to_domains} domainlist relay_to_domains = ${concatStringsSep ":" cfg.relay_to_domains}
domainlist sender_domains = ${concatStringsSep ":" cfg.sender_domains}
hostlist relay_from_hosts = <;${concatStringsSep ";" cfg.relay_from_hosts} hostlist relay_from_hosts = <;${concatStringsSep ";" cfg.relay_from_hosts}
acl_smtp_rcpt = acl_check_rcpt
acl_smtp_data = acl_check_data acl_smtp_data = acl_check_data
acl_smtp_mail = acl_check_mail
acl_smtp_rcpt = acl_check_rcpt
never_users = root never_users = root
@ -173,11 +175,41 @@ let
acl_check_data: acl_check_data:
warn warn
sender_domains = ${concatStringsSep ":" cfg.sender_domains} sender_domains = +sender_domains
set acl_m_special_dom = $sender_address_domain set acl_m_special_dom = $sender_address_domain
accept accept
acl_check_mail:
accept
sender_domains = +sender_domains
hosts = +relay_from_hosts
deny
spf = fail : softfail
log_message = spf=$spf_result
message = SPF validation failed: \
$sender_host_address is not allowed to send mail from \
''${if def:sender_address_domain\
{$sender_address_domain}\
{$sender_helo_name}}
deny
spf = permerror
log_message = spf=$spf_result
message = SPF validation failed: \
syntax error in SPF record(s) for \
''${if def:sender_address_domain\
{$sender_address_domain}\
{$sender_helo_name}}
defer
spf = temperror
log_message = spf=$spf_result; deferred
message = temporary error during SPF validation; \
please try again later
warn
spf = none : neutral
log_message = spf=$spf_result
accept
add_header = $spf_received
begin routers begin routers