From patchwork Tue Dec 21 19:36:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35525 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 DEA4227BBEA; Tue, 21 Dec 2021 19:38:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 80C2827BBE9 for ; Tue, 21 Dec 2021 19:38:26 +0000 (GMT) Received: from localhost ([::1]:36942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzkxt-0002hp-Mc for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 14:38:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkxW-0002fA-Co for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzkxW-0004Kg-3h for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzkxW-00079x-2l for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52714] [PATCH v2 3/4] services: postgresql: Ensure correct ownership of directory trees. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 19:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52714@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164011542727446 (code B ref -1); Tue, 21 Dec 2021 19:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 19:37:07 +0000 Received: from localhost ([127.0.0.1]:55702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwd-00078Z-0A for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:37:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:37552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwT-000775-2F for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwS-0001xd-NW for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:45729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwP-0004Em-BS for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 45DF960009 for ; Tue, 21 Dec 2021 19:36:50 +0000 (UTC) From: Brice Waegeneire Date: Tue, 21 Dec 2021 20:36:45 +0100 Message-Id: <20211221193646.16849-3-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 In-Reply-To: <8735mleoxo.fsf_-_@waegenei.re> References: <8735mleoxo.fsf_-_@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.195; envelope-from=brice@waegenei.re; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/databases.scm (postgresql-activation): Replace 'chown' calls by 'lchown-recursive'. --- gnu/services/databases.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 39225a4bd6..58d93a8e35 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 David Larsson +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,8 +215,11 @@ (define postgresql-activation (($ postgresql port locale config-file log-directory data-directory extension-packages) - #~(begin + (with-imported-modules (source-module-closure + '((gnu build activation))) + #~(begin (use-modules (guix build utils) + (gnu build activation) (ice-9 match)) (let ((user (getpwnam "postgres")) @@ -230,19 +234,19 @@ (define postgresql-activation '())))) ;; Create db state directory. (mkdir-p #$data-directory) - (chown #$data-directory (passwd:uid user) (passwd:gid user)) + (lchown-recursive #$data-directory (passwd:uid user) (passwd:gid user)) ;; Create the socket directory. (let ((socket-directory #$(postgresql-config-file-socket-directory config-file))) (when (string? socket-directory) (mkdir-p socket-directory) - (chown socket-directory (passwd:uid user) (passwd:gid user)))) + (lchown-recursive socket-directory (passwd:uid user) (passwd:gid user)))) ;; Create the log directory. (when (string? #$log-directory) (mkdir-p #$log-directory) - (chown #$log-directory (passwd:uid user) (passwd:gid user))) + (lchown-recursive #$log-directory (passwd:uid user) (passwd:gid user))) ;; Drop privileges and init state directory in a new ;; process. Wait for it to finish before proceeding. @@ -262,7 +266,7 @@ (define postgresql-activation initdb-args))) (lambda () (primitive-exit 1)))) - (pid (waitpid pid)))))))) + (pid (waitpid pid))))))))) (define postgresql-shepherd-service (match-lambda