From patchwork Mon Aug 10 06:51:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23573 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 955AC27BBE4; Mon, 10 Aug 2020 07:52:08 +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 5727827BBE3 for ; Mon, 10 Aug 2020 07:52:08 +0100 (BST) Received: from localhost ([::1]:58692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51fD-0005zH-Uf for patchwork@mira.cbaines.net; Mon, 10 Aug 2020 02:52:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k51f7-0005xa-WD for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k51f7-0006nM-Mj for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k51f7-0004hY-Kv for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35619] [PATCH 1/5] gnu: postfix-minimal: Updato to 3.5.0. References: <567ff351-d0f4-4143-af85-4a0e5c83c012@www.fastmail.com> In-Reply-To: <567ff351-d0f4-4143-af85-4a0e5c83c012@www.fastmail.com> Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Aug 2020 06:52:01 +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.159704228617999 (code B ref 35619); Mon, 10 Aug 2020 06:52:01 +0000 Received: (at 35619) by debbugs.gnu.org; 10 Aug 2020 06:51:26 +0000 Received: from localhost ([127.0.0.1]:34149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eT-0004ft-US for submit@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eR-0004fW-IU for 35619@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44333) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51eM-0006k4-9I; Mon, 10 Aug 2020 02:51:14 -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 1k51eL-0003F6-Lb; Mon, 10 Aug 2020 02:51:14 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 10 Aug 2020 08:51:08 +0200 Message-Id: <20200810065112.6879-1-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 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/packages/mail.scm (postfix-minimal): Update to 3.5.0. Fixes build with glibc-2.30. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a2708ed1a2..94236bbbcd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3558,7 +3558,7 @@ based on asyncio.") (define-public postfix-minimal (package (name "postfix-minimal") - (version "3.4.8") + (version "3.5.0") (source (origin (method url-fetch) (uri (string-append "http://cdn.postfix.johnriley.me/" @@ -3566,7 +3566,7 @@ based on asyncio.") "postfix-" version ".tar.gz")) (sha256 (base32 - "0hw9kbr05qdzvfqhxi4dp4n3s9xvdh0gr0la08a4bip06ybl4pcd")))) + "1k2mxx9yx8lif804ff7zjyllizv4najfv3dca912k6j46fbr5b12")))) (build-system gnu-build-system) (arguments '(#:phases From patchwork Mon Aug 10 06:51:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23576 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 809A927BBE4; Mon, 10 Aug 2020 07:52:28 +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 3159727BBE3 for ; Mon, 10 Aug 2020 07:52:28 +0100 (BST) Received: from localhost ([::1]:59582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51fX-0006N5-OI for patchwork@mira.cbaines.net; Mon, 10 Aug 2020 02:52:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k51f8-0005y5-CH for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k51f8-0006nX-2c 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-0004hf-0p for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35619] [PATCH 2/5] system: examples: Add postfix.tmpl. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Aug 2020 06:52:01 +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.159704228618006 (code B ref 35619); Mon, 10 Aug 2020 06:52:01 +0000 Received: (at 35619) by debbugs.gnu.org; 10 Aug 2020 06:51:26 +0000 Received: from localhost ([127.0.0.1]:34154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eX-0004gG-Se for submit@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eT-0004fZ-78 for 35619@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44334) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51eN-0006kK-L0; Mon, 10 Aug 2020 02:51:15 -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 1k51eM-0003F6-T4; Mon, 10 Aug 2020 02:51:15 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 10 Aug 2020 08:51:09 +0200 Message-Id: <20200810065112.6879-2-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/system/examples/postfix.tmpl: New file. --- gnu/system/examples/postfix.tmpl | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 gnu/system/examples/postfix.tmpl diff --git a/gnu/system/examples/postfix.tmpl b/gnu/system/examples/postfix.tmpl new file mode 100644 index 0000000000..e0b335954e --- /dev/null +++ b/gnu/system/examples/postfix.tmpl @@ -0,0 +1,52 @@ +;; This is an operating system configuration template for testing postfix. + +(use-modules (gnu)) +(use-service-modules mail networking ssh) +(use-package-modules ssh) + +(operating-system + (host-name "komputilo") + (timezone "Europe/Berlin") + (locale "en_US.utf8") + + ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the + ;; target hard disk, and "my-root" is the label of the target + ;; root file system. + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) + + ;; Allow run-vm.sh --nographic + (kernel-arguments '("console=tty0" "console=ttyS0")) + (file-systems (cons (file-system + (device (file-system-label "guix")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + + ;; This is where user accounts are specified. The "root" + ;; account is implicit, and is initially created with the + ;; empty password. + (users (cons (user-account + (name "alice") + (comment "Bob's sister") + (group "users") + + ;; Adding the account to the "wheel" group + ;; makes it a sudoer. + (supplementary-groups '("wheel"))) + %base-user-accounts)) + + ;; Add services to the baseline: a DHCP client, POSTFIX and + ;; an SSH server. + (services (append (list (service dhcp-client-service-type) + (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (use-pam? #f) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + (service postfix-service-type)) + %base-services))) From patchwork Mon Aug 10 06:51:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23574 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 1ABF327BBE5; Mon, 10 Aug 2020 07:52:21 +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 83D6B27BBE4 for ; Mon, 10 Aug 2020 07:52:20 +0100 (BST) Received: from localhost ([::1]:59096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51fQ-0006AZ-2O for patchwork@mira.cbaines.net; Mon, 10 Aug 2020 02:52:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k51f8-0005yS-Nr for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k51f8-0006nf-EP 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-0004hm-D6 for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35619] [PATCH 3/5] gnu: postfix-minimal: Fix startup warnings. 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.159704229118018 (code B ref 35619); Mon, 10 Aug 2020 06:52:02 +0000 Received: (at 35619) by debbugs.gnu.org; 10 Aug 2020 06:51:31 +0000 Received: from localhost ([127.0.0.1]:34156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eY-0004gN-8r for submit@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eU-0004fb-37 for 35619@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44335) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51eO-0006kT-Pe; Mon, 10 Aug 2020 02:51:16 -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 1k51eO-0003F6-7p; Mon, 10 Aug 2020 02:51:16 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 10 Aug 2020 08:51:10 +0200 Message-Id: <20200810065112.6879-3-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 This avoids kind of funny replacements like these of `rm' find -prune -perm -020 => find -prune -pe/gnu/store/zibwkb5xavnv6z3gzknfqjsxb9b0izh0-coreutils-8.31/bin/rm -020 * gnu/packages/mail.scm (postfix-minimal)[phases]: Set PATH rather than substituting individual commands. --- gnu/packages/mail.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 94236bbbcd..5f622595c9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Brant Gardner +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -3569,7 +3570,10 @@ based on asyncio.") "1k2mxx9yx8lif804ff7zjyllizv4najfv3dca912k6j46fbr5b12")))) (build-system gnu-build-system) (arguments - '(#:phases + '(#:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases (add-before 'build 'patch-/bin/sh (lambda _ @@ -3601,14 +3605,20 @@ based on asyncio.") (lambda _ (invoke "make" "makefiles" "pie=yes" "dynamicmaps=yes"))) (add-before 'install 'fix-postfix-scripts-path - (lambda _ - (for-each - (lambda (command) - (substitute* '("postfix-install" "conf/post-install" "conf/postfix-script") - (((string-append command " ")) (string-append (which command) " ")))) - '("awk" "chmod" "chown" "chgrp" "cp" "find" "ln" "mkdir" "mv" "rm" "sed" - "sleep" "sort" "touch" "uname")) - #t)) + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (string-join + (map (compose (cute string-append <> "/bin") + (cute assoc-ref inputs <>)) + '("bash" "coreutils" "findutils" "gawk" "grep" + "sed")) + ":"))) + (substitute* '("postfix-install" + "conf/post-install" + "conf/postfix-script") + (("^SHELL=/bin/sh") + (string-append "PATH=" path "\n" + "SHELL=" (assoc-ref inputs "bash") "/bin/sh"))) + #t))) (add-before 'install 'configure-install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) 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)))) From patchwork Mon Aug 10 06:51:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 23575 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 2C30327BBE4; Mon, 10 Aug 2020 07:52:27 +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 DC96127BBE3 for ; Mon, 10 Aug 2020 07:52:26 +0100 (BST) Received: from localhost ([::1]:59516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51fW-0006LF-FR for patchwork@mira.cbaines.net; Mon, 10 Aug 2020 02:52:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k51f9-0005zX-IY for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k51f9-0006nu-8n for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k51f9-0004i0-7G for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35619] [PATCH 5/5] system: postfix.tmpl: Add mail-aliases-service. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Aug 2020 06:52:03 +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.159704229218033 (code B ref 35619); Mon, 10 Aug 2020 06:52:03 +0000 Received: (at 35619) by debbugs.gnu.org; 10 Aug 2020 06:51:32 +0000 Received: from localhost ([127.0.0.1]:34160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51ee-0004gg-4c for submit@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eW-0004ff-I0 for 35619@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44337) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51eR-0006ko-93; Mon, 10 Aug 2020 02:51:19 -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 1k51eQ-0003F6-MK; Mon, 10 Aug 2020 02:51:19 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 10 Aug 2020 08:51:12 +0200 Message-Id: <20200810065112.6879-5-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/system/examples/postfix.tmpl: Add mail-aliases-service-type. --- gnu/system/examples/postfix.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/system/examples/postfix.tmpl b/gnu/system/examples/postfix.tmpl index e0b335954e..7ebc8544f5 100644 --- a/gnu/system/examples/postfix.tmpl +++ b/gnu/system/examples/postfix.tmpl @@ -48,5 +48,7 @@ (permit-root-login #t) (allow-empty-passwords? #t) (password-authentication? #t))) + (service mail-aliases-service-type + '(("postmaster" "root"))) (service postfix-service-type)) %base-services)))