summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-08-10 07:55:38 +0200
committerRicardo Wurmus <rekado@elephly.net>2023-09-07 15:45:17 +0200
commit3349e7c690302d4065261e3a44571a97b340ce32 (patch)
tree7efa7a702e4ba75ab4f134bfbc872a6aec93e66e
parentc52328776531a149ec78859c647942d5804be014 (diff)
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.
-rw-r--r--gnu/services/mail.scm12
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index e533569c88..fe8ed22469 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Gábor Boskovits <boskovits@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2112,9 +2113,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)))))
@@ -2130,6 +2139,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))))