From patchwork Mon Mar 31 22:10:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 41096 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 254E627BBE2; Mon, 31 Mar 2025 23:11:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED 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 DF63727BBE9 for ; Mon, 31 Mar 2025 23:11:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzNLX-0008TV-Og; Mon, 31 Mar 2025 18:11:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tzNLV-0008Sb-7m for guix-patches@gnu.org; Mon, 31 Mar 2025 18:11:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tzNLU-0006v1-3A; Mon, 31 Mar 2025 18:11:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=JvDk2meoNP34QgiOlt5YUfRidy7KnNc1cP4o+k5JzsY=; b=QFVMOsCef4EPvE8ZOCk8Xe+OcEh+sC7kjJHVYv8qKnMfNz75kQLmz1YCZDv+d7ZL3MV3jJBVg+FQfKzUZ2zKL1EUtJ7Y1+Q/06l4TAzIwKonDV5x0etYwQNHh2VqKYPsZfP+xcga+Tyf4TLzB5L91UGusIKygKbtWToMFlEx+nhcneRKw8b5vDZ2Znkji/+BbVeczwqDXu+B7uDedmh3RpF3kqSCWWHPlNECR/tqQ6hCnEUQ1Wnh2Lk4+BbpOekHbNX1Z3LksJ+eEmdQRPRKrjUaBR+d9uZsmchRdjV182ZgObHVVaHtVBCfJIpXIrlt+CMoGG0n4VZxJnWkMyNqZQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzNLT-0000UN-Lt; Mon, 31 Mar 2025 18:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 02/14] services: gitolite-rc-file: Add log-extra field. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 22:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77186@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590441711 (code B ref 77186); Mon, 31 Mar 2025 22:11:03 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:10:44 +0000 Received: from localhost ([127.0.0.1]:43337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNL8-0000R4-4t for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:44 -0400 Received: from wolfsden.cz ([37.205.8.62]:40958) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL1-0000PR-VO for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:37 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 03DF13796A5; Mon, 31 Mar 2025 22:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459034; bh=aowMKOdBUUwpFwq/mEDez3/EpLiFLdir4q7Sif7WCIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iuEqmQ1DCuNzM63R3DzpFs/ZQBNowOGiHrHvzreu1DC0uedRW2MIUZANI/TnerX80 RL0CPEc3XZMKyelbzWOgDfQLl2ri8wwJlKY/sbanuS4VDRQcXj2moauFUEUqY4QImD oWGidbIdMyD3XpMC2tvlxjuGaEpgVBPy7XbeoUSBte6ggXQT/qSsxSfwamjkfZWLew f2M5fLrI7BMR/8q3NVUnMVDKqTu393odVImVPzZsTdxrzLNPkJbvdM0+0vG3fMGLUV neoQn5p2m3D00KniLvc+aKvUedN492x3wKx7hsD1w71PaylV0j+5AJZpMj4UYk+Yqt UVW+iCcHJp+AZ4Y0r49Tg18f/j6NpAaGZ5FhrJAKjljDMmGpDF8bZf9Y31ABNVhIL/ IRZ5RXoVvVcqja+7eZLiC/OA2XIsQFkzxkB5dRua6HfRFlbE3fwQT+R2AEoI2i+myA fSdyOxbYJGUenb5nUUhGg+w/op2t41wJIY4oVsJe05XWYcY3r3gDL8I0yphL/PQgPL 7U2bB7Kz0bplUvS3ntBmOKGvNj29T/SqpmbxroN41jHpDxh4xe4189SbRqo9WdBT3D 2G/jK94KD77YefB8vSt3yqrBvFhj7NBh7lvguJzSQeDKmG+jx2velH/noqceyXjWrP Aq8hjShzc5U5pIBGMHjZqFfs= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 927E4378741; Mon, 31 Mar 2025 22:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459033; bh=aowMKOdBUUwpFwq/mEDez3/EpLiFLdir4q7Sif7WCIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wolU27wQEDaJA1Fq0z0nM2jZXHSj9aGU1UMb/zPl9fkPXic5ZLr4dth1dtfLeN3Um 0fvi72KUxm0duuEDP3rVceSGeTy6kBFHxREuT830aPv7Tn6EZl/oYG0wApCq0JwqCx wXb+rlwcFCQS/gqWt/7NszLCZabxEjQYqcgyIRxgzG0O6UvtQ+qaXvaMBF0fTLCraO XUoMpkQPjUQkf7BP6q8KW1/YIWMetW6i3AK7NSAkaO03AqZ7DwZC1PaKPkYtAetYHz XxoAVgz09gyOP9dU9wbTb4A+kw1eSWYlWO3Z93Ly6YGdabaVGFVPAV5u3HoiLnV+QZ 6jvVNsQ0WFtbR31gvqOKYzFTn6JeWdOkcTaC1vH4MXXAcaJwjd3jlSa10rMP/sYw9b Py4HGQtqlPnTy7h0r8en9dFR79qpVwo/t9XkcpH98ddB7ZpNOwofCx7bgA9ay4kgUY trw5AF/WuSlelhqRjF04A2WC3+tA4AhPkMAfQwZU3tOASBy9JoRk28eIg/I+t7Ddxl SH1a7KtmqPtmJ61QW6awMeOKDmUbh2NIKtYCRh9ESWZnaemx0tnHH727xSpZikU0B4 jfW27yA5NDyF/iN5RBVizySkRpbiV69NnARMMzhMtkwVJ+9DpLMWUNslItL+cGkyPT IN2umXPBl3NVCPiVhcMlTwws= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:08 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/version-control.scm (): Add log-extra field. (gitolite-rc-file-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Ice65dbdf4f42549e3c83914da7229db9d2cf856b --- doc/guix.texi | 7 +++++++ gnu/services/version-control.scm | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index f6d774fd13..bc8e7206d5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41061,6 +41061,13 @@ Version Control Services Gitolite allows you to set git config values using the @samp{config} keyword. This setting allows control over the config keys to accept. +@item @code{log-extra} (default: @code{#f}) +Whether gitolite should log extra details. + +For historical reasons, this field defaults to @code{#f}. The default +value from gitolite however is @code{1} (written as @code{#t} in this +configuration). + @item @code{roles} (default: @code{'(("READERS" . 1) ("WRITERS" . ))}) Set the role names allowed to be used by users running the perms command. diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index f5558e9197..344538a73e 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -60,6 +60,7 @@ (define-module (gnu services version-control) gitolite-rc-file-umask gitolite-rc-file-unsafe-pattern gitolite-rc-file-git-config-keys + gitolite-rc-file-log-extra gitolite-rc-file-roles gitolite-rc-file-enable @@ -252,6 +253,8 @@ (define-record-type* (default #f)) (git-config-keys gitolite-rc-file-git-config-keys (default "")) + (log-extra gitolite-rc-file-log-extra + (default #f)) (roles gitolite-rc-file-roles (default '(("READERS" . 1) ("WRITERS" . 1)))) @@ -269,7 +272,8 @@ (define-record-type* (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) (match-record file - (umask local-code unsafe-pattern git-config-keys roles enable) + ( umask local-code unsafe-pattern git-config-keys log-extra + roles enable) (apply text-file* "gitolite.rc" `("%RC = (\n" " UMASK => " ,(format #f "~4,'0o" umask) ",\n" @@ -277,6 +281,9 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if local-code (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) "") + ,(if log-extra + " LOG_EXTRA => 1,\n" + "") " ROLES => {\n" ,@(map (match-lambda ((role . value)