From patchwork Mon Aug 10 06:51:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23577 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 444AD27BBE4; Mon, 10 Aug 2020 07:52:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EF93E27BBE3 for ; Mon, 10 Aug 2020 07:52:33 +0100 (BST) Received: from localhost ([::1]:59952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51fd-0006Wq-IS for patchwork@mira.cbaines.net; Mon, 10 Aug 2020 02:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k51f9-0005yx-3w for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k51f8-0006no-RF for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k51f8-0004ht-PT for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35619] [PATCH 4/5] service: postfix: Use mail-aliases-service-type. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Aug 2020 06:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?utf-8?b?R8OhYm9y?= Boskovits , 35619@debbugs.gnu.org Received: via spool by 35619-submit@debbugs.gnu.org id=B35619.159704229218025 (code B ref 35619); Mon, 10 Aug 2020 06:52:02 +0000 Received: (at 35619) by debbugs.gnu.org; 10 Aug 2020 06:51:32 +0000 Received: from localhost ([127.0.0.1]:34158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51ed-0004gZ-Qx for submit@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eV-0004fd-Bd for 35619@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44336) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51eQ-0006kg-29; Mon, 10 Aug 2020 02:51:18 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=46134 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1k51eP-0003F6-E6; Mon, 10 Aug 2020 02:51:17 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 10 Aug 2020 08:51:11 +0200 Message-Id: <20200810065112.6879-4-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200810065112.6879-1-janneke@gnu.org> References: <20200810065112.6879-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 59cb373fbf..9a0066d920 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Kristofer Buffington ;;; Copyright © 2020 Gábor Boskovits +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1956,9 +1957,17 @@ inet_protocols = ipv4 (match-record config (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))))