01/03: gnu: Update opensmtpd configuration grammar.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit c3f146e79aca0efec5c0cbbf4e39c79e09268c15
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Thu Jan 30 17:53:50 2020 +0100

    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.
---
 gnu/services/mail.scm | 10 +++++++---
 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 2606aa9..d973165 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015 Andy Wingo <address@hidden>
 ;;; Copyright © 2017, 2018 Clément Lassieur <address@hidden>
 ;;; Copyright © 2017 Carlo Zancanaro <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2019 Kristofer Buffington <address@hidden>
 ;;;
 ;;; 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 bb446da..023f59d 100644
--- a/gnu/tests/mail.scm
+++ b/gnu/tests/mail.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
 ;;; Copyright © 2018 Clément Lassieur <address@hidden>
 ;;; Copyright © 2019 Christopher Baines <address@hidden>
-;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; 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)