diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
| commit | 6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09 (patch) | |
| tree | c2c35f733d250f86eb052d174fcb1c24a54fea79 /gnu/services/mail.scm | |
| parent | 20e4ee1e3b7044d9f64de02c6237b00e5a57da35 (diff) | |
| parent | 010689e7067df1288af29176f4a8639de816b1ef (diff) | |
| download | guix-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.tar.gz guix-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.zip | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/services/mail.scm')
| -rw-r--r-- | gnu/services/mail.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 216b2c80b0..3de0b4c2f3 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -3,6 +3,7 @@ ;;; 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 © 2019 Kristofer Buffington <kristoferbuffington@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,7 +70,7 @@ imap4d-configuration imap4d-configuration? imap4d-service-type - %defualt-imap4d-config-file)) + %default-imap4d-config-file)) ;;; Commentary: ;;; @@ -1667,6 +1668,9 @@ accept from local for any relay (mkdir-p "/var/spool/smtpd") (chmod "/var/spool/smtpd" #o711)))))) +(define %opensmtpd-pam-services + (list (unix-pam-service "smtpd"))) + (define opensmtpd-service-type (service-type (name 'opensmtpd) @@ -1675,6 +1679,8 @@ accept from local for any relay (const %opensmtpd-accounts)) (service-extension activation-service-type opensmtpd-activation) + (service-extension pam-root-service-type + (const %opensmtpd-pam-services)) (service-extension profile-service-type (compose list opensmtpd-configuration-package)) (service-extension shepherd-root-service-type |