Fix smtpd configuration for newer syntax

Julien LepillerWed Jan 29 21:40:50+0100 2020

c397649

Fix smtpd configuration for newer syntax

modules/config/mail.scm

5050
# See smtpd.conf(5) for more information.
5151
5252
# My TLS certificate and key
53-
pki lepiller.eu certificate \"/etc/letsencrypt/live/" domain "/fullchain.pem\"
53+
pki lepiller.eu cert \"/etc/letsencrypt/live/" domain "/fullchain.pem\"
5454
pki lepiller.eu key \"/etc/letsencrypt/live/" domain "/privkey.pem\"
5555
5656
# Edit this file to add more virtual users (passwords are read in that file

6262
listen on " interface " port 25 tls pki lepiller.eu
6363
# For sending messages from outside of this server, you need to authenticate and
6464
# use TLS.
65-
listen on " interface " port 587 tls-require pki lepiller.eu mask-source auth <passwd>
65+
listen on " interface " port 587 tls-require pki lepiller.eu mask-src auth <passwd>
6666
# On this server, you only need to authenticate on one of the available ports,
6767
# and you may use TLS.
68-
listen on lo port 25 tls pki lepiller.eu mask-source auth <passwd>
69-
listen on lo port 587 tls pki lepiller.eu mask-source auth <passwd>
68+
listen on lo port 25 tls pki lepiller.eu mask-src auth <passwd>
69+
listen on lo port 587 tls pki lepiller.eu mask-src auth <passwd>
7070
listen on lo port 10028 tag DKIM_OUT # DKIMproxy
7171
7272
# Maybe it'll work better if we connect to gmail only with v4?
73-
limit mta for domain gmail.com inet4
73+
#limit mta for domain gmail.com inet4
7474
7575
# TODO: manage these files directly in the configuration?
7676
# If you edit the file, you have to run \"smtpctl update table aliases\"

7979
table other-relays file:" relays-file "
8080
table blacklist file:" blacklist-file "
8181
82+
# We define some actions
83+
action receive maildir alias <aliases>
84+
action outbound relay
85+
action godkim relay host smtp://127.0.0.1:10027
86+
8287
# We accept to relay any mail from authenticated users
83-
accept for any authenticated relay via smtp://127.0.0.1:10027
84-
accept tagged DKIM_OUT for any relay
88+
match for any from any auth action godkim
89+
match tag DKIM_OUT for any action outbound
8590
8691
# Then, we reject on some other conditions:
8792
8893
# If the mail tries to impersonate us
89-
reject from ! source <other-relays> sender \"@lepiller.eu\" for any
94+
#match ! from src <other-relays> from any mail-from \"@lepiller.eu\" for any reject
9095
# If it comes from someone on the blacklist
91-
reject from any sender <blacklist> for any
96+
match from any mail-from <blacklist> reject
9297
9398
# Finaly, if we accept incoming messages
94-
accept from any for domain \"lepiller.eu\" virtual <aliases> deliver to maildir
95-
accept for local alias <aliases> deliver to maildir
99+
match from any for domain \"lepiller.eu\" action receive
100+
match for local action receive
96101
"))
97102
98103
(define (lepiller-imap-service domain)