ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Update opensmtpd configuration grammar.

Browse source 
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:
Tobias Geerinckx-Rice 2020-01-30 17:53:50 +01:00
parent 9ea68dd7be
commit c3f146e79a
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/services/mail.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; 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> ;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -1621,8 +1621,12 @@ (define-record-type* <opensmtpd-configuration>
(define %default-opensmtpd-config-file (define %default-opensmtpd-config-file
(plain-file "smtpd.conf" " (plain-file "smtpd.conf" "
listen on lo 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 (define opensmtpd-shepherd-service

5
gnu/tests/mail.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,7 +47,8 @@ (define %opensmtpd-os
(config-file (config-file
(plain-file "smtpd.conf" " (plain-file "smtpd.conf" "
listen on 0.0.0.0 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) (define (run-opensmtpd-test)