mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
gnu: Update opensmtpd configuration grammar.
This follows up on commit 0d48690908
.
* gnu/services/mail.scm (%default-opensmtpd-config-file): Adapt to ‘new’
≥6.4 grammar.
* gnu/tests/mail.scm (%opensmtpd-os): Likewise.
This commit is contained in:
parent
9ea68dd7be
commit
c3f146e79a
2 changed files with 10 additions and 5 deletions
|
@ -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 @@ (define-record-type* <opensmtpd-configuration>
|
|||
(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
|
||||
|
|
|
@ -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 @@ (define %opensmtpd-os
|
|||
(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)
|
||||
|
|
Loading…
Reference in a new issue