diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:35:51 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:35:51 +0100 |
commit | 0a83339bb1429332ee889e9a976aa214ae2ac0db (patch) | |
tree | 9c3d2bcbdba2c670a5f8f98d3557f0444c357327 /gnu/services/mail.scm | |
parent | 20fe3cd761c286a27236d8fced4152a0ccdc547d (diff) | |
parent | 75385105348066201ef898b934917eeb6ceab87a (diff) | |
download | guix-0a83339bb1429332ee889e9a976aa214ae2ac0db.tar guix-0a83339bb1429332ee889e9a976aa214ae2ac0db.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/mail.scm')
-rw-r--r-- | gnu/services/mail.scm | 10 |
1 files changed, 7 insertions, 3 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 |