From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sGr3BlVBtmGxUwEAgWs5BA (envelope-from ) for ; Sun, 12 Dec 2021 19:37:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qMSfAlVBtmELeAAAbx9fmQ (envelope-from ) for ; Sun, 12 Dec 2021 18:37:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CE82ED049 for ; Sun, 12 Dec 2021 19:37:08 +0100 (CET) Received: from localhost ([::1]:51176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwTid-0005vZ-Vt for larch@yhetil.org; Sun, 12 Dec 2021 13:37:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0005tf-LY for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0001L5-Ck for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwTiY-0003qq-AO for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52454] [PATCH 3/4] services: postgresql: Ensure correct ownership of directory trees. References: <87h7bdad9o.fsf@waegenei.re> In-Reply-To: <87h7bdad9o.fsf@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52454@debbugs.gnu.org Received: via spool by 52454-submit@debbugs.gnu.org id=B52454.163933419914755 (code B ref 52454); Sun, 12 Dec 2021 18:37:02 +0000 Received: (at 52454) by debbugs.gnu.org; 12 Dec 2021 18:36:39 +0000 Received: from localhost ([127.0.0.1]:53103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTiB-0003ps-Fv for submit@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:39 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:53299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTi8-0003pF-QG for 52454@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:37 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 731FAFF807 for <52454@debbugs.gnu.org>; Sun, 12 Dec 2021 18:36:30 +0000 (UTC) From: Brice Waegeneire Date: Sun, 12 Dec 2021 19:36:13 +0100 Message-Id: <20211212183614.19730-3-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639334228; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=vB8+glSp3ymhxRH58IeALWLoYlKOjrLKujlM3jF6sZ0=; b=qf1h23kwQtEYfYLGsxAj5zfPu4QIZw9cB0aD1fEPdkd18IJX4EEOKLCoodTr/V6tQffU5e +WUKzLJBvbOYRy4uHaZSKY8jlRMzvtku6eQUKRnio9n10Z5OJHUQ3faAfwVLQHYcKIuzrV 3ypaH1Mp92uQJfPlSKJbt9M7V/WYTzMZJoTshk7XzuhhNVUHaL0hgrG1SMr8pFQwiNGQ/Q JDnrsHOb5NL+Gd9o/PnPW2Nc2uTZIwMHrqcWAmNO51U8h/dy41kmmAQNon/pmofopvGto0 1W4wIjqMru5NQu+pFwX8xMzpBtJAkZ5FgKqvLclp0KNggGLaoElyCBNfy4ehLw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639334228; a=rsa-sha256; cv=none; b=pZVsK1O+ESly6zEKmyeYC4HXG1lzk3eO+WqqfwnmFpgdb9vkTseAgzQ/cj8YvvYqTng7c5 fRTsq3WeENyx+v1Mth92YeZyeypLqKKJ3kzPLF6dAg0S6cBrCbO1VTrEIqzVq7iwJ5r2TU qyzpYwyvVOXIXsI+HXsS7K9QebRxnYnOhIxLFVkaJ71OTg0vcsg/5InkwyrOcsueP3rSdT ZJt7ResQ5PUNH5BCKuHf/90yHwl11s9QSZ45AzSr12KX2Rw8rWuwPAZAdxZg/yYIsK3rrs NfcHw1KEN/BTflAmT58otoX2ymyD+zBF7cc/7wTgBWR2GqpSNSSHjgJvqO7UFg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.07 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: CE82ED049 X-Spam-Score: -2.07 X-Migadu-Scanner: scn1.migadu.com X-TUID: PlwOl9agzfLR * 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 8e983ef0be..83f9fe5239 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