cwebber pushed a commit to branch wip-postfix
in repository guix.
commit bb76f5a30dadaa588b77b38874427725ab4621d1
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Mon Aug 10 07:55:38 2020 +0200
service: postfix: Use mail-aliases-service-type.
* gnu/services/mail.scm (postfix-service-type): Extend
mail-aliases-service-type.
(postfix-shepherd-service): Generate /etc/aliases.db if necessary.
---
gnu/services/mail.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index f77a87b..71b10ac 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Kristofer Buffington <[email protected]>
;;; Copyright © 2020 Jonathan Brielmaier <[email protected]>
;;; Copyright © 2020 Gábor Boskovits <[email protected]>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2067,9 +2068,17 @@ inet_protocols = ipv4
(match-record config <postfix-configuration>
(postfix)
(let* ((postfix-binary (file-append postfix "/postfix"))
+ (postalias-binary (file-append postfix "/postalias"))
(postfix-action
(lambda (action)
#~(lambda _
+ (when (or (not (file-exists? "/etc/aliases.db"))
+ (> (stat:mtime (stat "/etc/aliases"))
+ (stat:mtime (stat "/etc/aliases.db"))))
+ (invoke #$postalias-binary
+ "-c"
+ #$(postfix-configuration-directory config)
+ "/etc/aliases"))
(invoke #$postfix-binary "-c"
#$(postfix-configuration-directory config)
#$action)))))
@@ -2085,6 +2094,7 @@ inet_protocols = ipv4
(name 'postfix)
(extensions (list (service-extension account-service-type postfix-accounts)
(service-extension activation-service-type
postfix-activation)
- (service-extension shepherd-root-service-type
postfix-shepherd-service)))
+ (service-extension shepherd-root-service-type
postfix-shepherd-service)
+ (service-extension mail-aliases-service-type (const
'()))))
(description "Run the Postfix MTA.")
(default-value (postfix-configuration))))
