[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: service: postfix: Use mail-aliases-service-type.
From: |
guix-commits |
Subject: |
06/07: service: postfix: Use mail-aliases-service-type. |
Date: |
Mon, 10 Aug 2020 02:49:35 -0400 (EDT) |
janneke pushed a commit to branch wip-postfix
in repository guix.
commit 6a55cec54541e4a8dedd4eb622e299ec4583c54a
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
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 59cb373..9a0066d 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com>
;;; Copyright © 2020 Gábor Boskovits <boskovits@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1956,9 +1957,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)))))
@@ -1974,6 +1983,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))))
- branch wip-postfix created (now 22ddd5a), guix-commits, 2020/08/10
- 01/07: gnu: Add postfix., guix-commits, 2020/08/10
- 02/07: services: Add postfix service., guix-commits, 2020/08/10
- 03/07: gnu: postfix-minimal: Updato to 3.5.0., guix-commits, 2020/08/10
- 04/07: system: examples: Add postfix.tmpl., guix-commits, 2020/08/10
- 05/07: gnu: postfix-minimal: Fix startup warnings., guix-commits, 2020/08/10
- 06/07: service: postfix: Use mail-aliases-service-type.,
guix-commits <=
- 07/07: system: postfix.tmpl: Add mail-aliases-service., guix-commits, 2020/08/10