From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 14:37:07 2021 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 To: guix-patches@gnu.org Subject: [PATCH v2 3/4] services: postgresql: Ensure correct ownership of directory trees. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 15:10:59 2021 Received: (at control) by debbugs.gnu.org; 21 Dec 2021 20:10:59 +0000 Received: from localhost ([127.0.0.1]:55758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlTO-00082G-Rt for submit@debbugs.gnu.org; Tue, 21 Dec 2021 15:10:58 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:40429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlTM-000821-Lt for control@debbugs.gnu.org; Tue, 21 Dec 2021 15:10:57 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 6DE9BFF805 for ; Tue, 21 Dec 2021 20:10:50 +0000 (UTC) Date: Tue, 21 Dec 2021 21:10:49 +0100 To: control@debbugs.gnu.org From: Brice Waegeneire Subject: control message for bug #52714 X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: -1.7 (-) merge 52714 52454 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 15:11:06 2021 Received: (at control) by debbugs.gnu.org; 21 Dec 2021 20:11:06 +0000 Received: from localhost ([127.0.0.1]:55765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlTW-00083L-0S for submit@debbugs.gnu.org; Tue, 21 Dec 2021 15:11:06 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:41691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlTU-00082N-JD for control@debbugs.gnu.org; Tue, 21 Dec 2021 15:11:04 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 0C1EB60009 for ; Tue, 21 Dec 2021 20:10:58 +0000 (UTC) Date: Tue, 21 Dec 2021 21:10:58 +0100 To: control@debbugs.gnu.org From: Brice Waegeneire Subject: control message for bug #52713 X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: -1.7 (-) merge 52713 52454 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 15:11:14 2021 Received: (at control) by debbugs.gnu.org; 21 Dec 2021 20:11:14 +0000 Received: from localhost ([127.0.0.1]:55768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlTe-00083g-5l for submit@debbugs.gnu.org; Tue, 21 Dec 2021 15:11:14 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:34747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlTc-00083T-RW for control@debbugs.gnu.org; Tue, 21 Dec 2021 15:11:13 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 428E3FF809 for ; Tue, 21 Dec 2021 20:11:07 +0000 (UTC) Date: Tue, 21 Dec 2021 21:11:06 +0100 To: control@debbugs.gnu.org From: Brice Waegeneire Subject: control message for bug #52712 X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: -1.7 (-) merge 52712 52454 quit