diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
| commit | 651478aa18a3f575d3b4cc14166a15a1c45b0f61 (patch) | |
| tree | 87c27dc9eff3d321f7ad4a622b110c517856a104 /gnu/services/mail.scm | |
| parent | 71c08ee60bb3f62bac0614888fb62405f7a388ab (diff) | |
| parent | 9a2e5fe5fdcc6ea848ceeefa0f70147dfb360639 (diff) | |
| download | patches-651478aa18a3f575d3b4cc14166a15a1c45b0f61.tar patches-651478aa18a3f575d3b4cc14166a15a1c45b0f61.tar.gz | |
Merge branch 'master' into staging
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 |