diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-01-30 17:53:50 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-01-31 00:42:48 +0100 |
| commit | c3f146e79aca0efec5c0cbbf4e39c79e09268c15 (patch) | |
| tree | e0708f47c39ed0b40bc191b6c44dec92e2d2f586 | |
| parent | 9ea68dd7be9627d2a6d8bbc21065e075439d15de (diff) | |
| download | guix-c3f146e79aca0efec5c0cbbf4e39c79e09268c15.tar.gz | |
gnu: Update opensmtpd configuration grammar.
This follows up on commit 0d486909083c98d7c75cdfc027f89e69f9bf8f48. * gnu/services/mail.scm (%default-opensmtpd-config-file): Adapt to ‘new’ ≥6.4 grammar. * gnu/tests/mail.scm (%opensmtpd-os): Likewise.
| -rw-r--r-- | gnu/services/mail.scm | 10 | ||||
| -rw-r--r-- | gnu/tests/mail.scm | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 2606aa9e3e..d97316512f 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> -;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -1621,8 +1621,12 @@ by @code{dovecot-configuration}. @var{config} may also be created by (define %default-opensmtpd-config-file (plain-file "smtpd.conf" " listen on lo -accept from any for local deliver to mbox -accept from local for any relay + +action inbound mbox +match for local action inbound + +action outbound relay +match from local for any action outbound ")) (define opensmtpd-shepherd-service diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index bb446da8f9..023f59df10 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> -;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,7 +47,8 @@ (config-file (plain-file "smtpd.conf" " listen on 0.0.0.0 -accept from any for local deliver to mbox +action inbound mbox +match from any for local action inbound ")))))) (define (run-opensmtpd-test) |