Skip to content

Commit

Permalink
Update default config
Browse files Browse the repository at this point in the history
Move checks to "smtp". Closes #274.
Do not use require_matching_ehlo. See #280.
  • Loading branch information
foxcpp committed Oct 11, 2020
1 parent fe890fa commit 5e9d910
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions maddy.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## maddy 0.3 - default configuration file (2020-05-31)
## Maddy Mail Server - default configuration file (2020-10-11)
# Suitable for small-scale deployments. Uses its own format for local users DB,
# should be managed via maddyctl utility.
#
Expand Down Expand Up @@ -56,14 +56,6 @@ storage.imapsql local_mailboxes {
hostname $(hostname)

msgpipeline local_routing {
dmarc yes
check {
require_matching_ehlo
require_mx_record
dkim
spf
}

# Insert handling for special-purpose local domains here.
# e.g.
# destination lists.example.org {
Expand Down Expand Up @@ -91,6 +83,13 @@ smtp tcp://0.0.0.0:25 {
all concurrency 10
}

dmarc yes
check {
require_mx_record
dkim
spf
}

source $(local_domains) {
reject 501 5.1.8 "Use Submission for outgoing SMTP"
}
Expand Down

0 comments on commit 5e9d910

Please sign in to comment.