From patchwork Mon Mar 31 22:10:10 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: 41107 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 7ABDF27BBE9; Mon, 31 Mar 2025 23:13:39 +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=ham 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 F369327BBE2 for ; Mon, 31 Mar 2025 23:13:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzNN5-0000Nk-0M; Mon, 31 Mar 2025 18:12:43 -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 1tzNMT-0000Ce-MT for guix-patches@gnu.org; Mon, 31 Mar 2025 18:12:06 -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 1tzNMT-0006ye-Bp; Mon, 31 Mar 2025 18:12:05 -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=/k8bVXux2UCtZrJETAVcy58RFtcWcG0eWteBjKN18No=; b=Jo8VV7NWMGIFsbW5f8cdCq2tQQVsRWtpv9+pNHdHUf22KUp2W1u/A96FuTsjE0wwCr76eB9Vl9CeAzf8T/hYpyE9LN0nKcUpUfe1CnNyOGpVXn816e8s/bBZUuHytOjN2eWBUZWz+5f0oq2b+6r3nsW5Rba2ZVIaZOae1XRTHcC5I+4A8coh5TDIU1jeG4GL/xL6KaXAXRWofriN8ZP0bizsWxEEAgMPZvloCKsFfzYluXQZ8BcfCAoPJ597tZMvi6GNb6lz2UNWEm26nGFsWdoo4NjQQvRzhkEyer5FDg0aG9Ht7m0HkDNz7r+3vZAF6xhmep+4Ej+H8J4VT1VEqg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzNMT-0000bF-6Y; Mon, 31 Mar 2025 18:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 04/14] services: gitolite-rc-file: Add extra-content 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:12:05 +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.17434590701957 (code B ref 77186); Mon, 31 Mar 2025 22:12:05 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:10 +0000 Received: from localhost ([127.0.0.1]:43356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLZ-0000VU-TB for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:10 -0400 Received: from wolfsden.cz ([37.205.8.62]:40984) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL4-0000Q4-FV for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:40 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 0854831FF7F; Mon, 31 Mar 2025 22:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459036; bh=+R/bDbSMzcL2pzteMyDKtQpeobhbcdruJDdMCMCfUWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BuW349EEb11ObOf5RyROt7Xk9+eyuZg+11hyFWR5lDX+afskawzYZ3WsrDE0In0Xm unXIu1zXqTqys9J40k5Z6ezRScVHDznHlBqBGNBtP5FDD9RDeLinDHAhhL8gZX2ClX p+ou4KgiOF+2KL0nKla0PxdtJo4U+tqqPHF4AjvqQPIWayH/9iPl+aOudl7jBAu/di mhoH/ZR64OnPLO18Ki5ppXVlL2p0GE3JOvHl6MI+lkC4vK74VMLvOznjF8eCRJATr+ s/M1FgtrG8I8zHqjnLXG+ZpvOVbaT39iCBhgyK+EMJ6HBRn/8QeEsrQt6IiC+GPCFD tWybRMMZ6BS8eSg/VbyuVAu9mjNJEW1Lae54XyRbcAdkyV13aP+yUm5GNU3NWa54UW gzFQElej1LCfbmD3C2VOEJ6ujAI2qB27p0HdX7Ut9eUAKKNo7K48+A6bgSe+c4lsSv i+5bRw+UswAvWjufE0L/vHCW9qjdhxbYhzF9CXed3Qe1xxZeevh/1RrD7b9iTfpltU 3yJdyS0q36rY7x3nmCrjssGAoR6lHOt1HuO0lYEnxE4tAm1eq2Zy7+ykaMT6k9ppNo Qu6iAhTo2PW0Yj4I57Gbb745/UfT1zRq67r3DdgXmAXJUqAJlk2/Qy63Uc9jy9dPmm +/63nI2KWoyy5gUa9PpOf+BQ= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 9971B378DC6; 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=+R/bDbSMzcL2pzteMyDKtQpeobhbcdruJDdMCMCfUWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KtqHfTaKPv13KY38RssLJozjBtvl1QnXnOzZ7ZkK4XCz8QR/N2futlmA1wyuHxDm3 UPsCTR/hyy7QHTGayHue8F/Z+voWT2+6qriUvE2W5m+9XdBizuH0rpw3dz3ZWQZgPJ 1Dv58AX3mjbnN6lDURQL9KVKpouxjt09pI7CrWVoDYkC/CmDTJFL0Xw0uq+N3pZnK7 fb/NC0l8mQ+61vbSsLnvCE4Kb6gGOA1rltrOYOeUsig6mLIv0c/nT8ZtMUP/fvnJM2 neU6MSRVqWyApZSmyf2iis5ayokORlsiJLzQQzXeZUGTLL/mBNQU/4KUYwQTgl3CRD NcSOYfMFcfl0bxlxTb+OAiwJObZkI4yI26bjA+X26542is1gYkP/GX4wpz05hodCbW f7wRUgnPYqRXcQge+fw2/OeoZ3jRbC6jFJfSXoB8pzCLkMupVDK19zQvTW5JOELEKx F3kmmF/QJ/xKRx35bIUZI+mnWEo9PuK8kgZPnP2rhJIE6TW/ifqg0ZogcFwNDDLtb3 Q+4WEynIe275hklC0plAUtEgpePWeS4VjlJKGJMjnUO2Q4wIdQ+jqk4GPLHbBqCzek G+XJvMd9hGRMCtMrU/XgRdUKIW43LUX0T7c8t73jDrhMPYPkYqhtJcOzLvTOAD3dIW 4BWGiv4CMiTyJhysg2tsWeoQ= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:10 +0200 Message-ID: <5a3d0685d485ab209edcffe2ffb3f779eece4869.1743459020.git.~@wolfsden.cz> 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 extra-content field. (gitolite-rc-file-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: I5082e1d7a27cc746641ba9ec8ae07c703da5f279 --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4daeab924b..299f84bb49 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41078,6 +41078,9 @@ Version Control Services @item @code{enable} (default: @code{'("help" "desc" "info" "perms" "writable" "ssh-authkeys" "git-config" "daemon" "gitweb")}) This setting controls the commands and features to enable within Gitolite. +@item @code{extra-content} (default: @code{""}) +Extra content to add verbatim into the @code{%RC} hash. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 2b99e8db86..9bd17334fe 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -64,6 +64,7 @@ (define-module (gnu services version-control) gitolite-rc-file-host-name gitolite-rc-file-roles gitolite-rc-file-enable + gitolite-rc-file-extra-content gitolite-service-type @@ -270,13 +271,15 @@ (define-record-type* "ssh-authkeys" "git-config" "daemon" - "gitweb")))) + "gitweb"))) + (extra-content gitolite-rc-extra-content + (default ""))) (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) (match-record file ( umask local-code unsafe-pattern git-config-keys log-extra - host-name roles enable) + host-name roles enable extra-content) (apply text-file* "gitolite.rc" `("%RC = (\n" " UMASK => " ,(format #f "~4,'0o" umask) ",\n" @@ -302,6 +305,7 @@ (define-gexp-compiler (gitolite-rc-file-compiler (simple-format #f " '~A',\n" value)) enable) " ],\n" + ,extra-content "\n" ");\n" "\n" ,(if unsafe-pattern