From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 00/13] Revamp the gitolite-service-type 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: Sat, 22 Mar 2025 16:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.174266213622775 (code B ref -1); Sat, 22 Mar 2025 16:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2025 16:48:56 +0000 Received: from localhost ([127.0.0.1]:45007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw21m-0005v8-OQ for submit@debbugs.gnu.org; Sat, 22 Mar 2025 12:48:56 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44258) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw21k-0005uW-H5 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 12:48:52 -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 <~@wolfsden.cz>) id 1tw21c-0003lb-AW for guix-patches@gnu.org; Sat, 22 Mar 2025 12:48:44 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tw21a-0002Kg-CM for guix-patches@gnu.org; Sat, 22 Mar 2025 12:48:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 5CE2D37E975; Sat, 22 Mar 2025 16:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662119; bh=+MvHkwy/ajJE9yDgNr7XrWltU0l1EOOAs4r1cMrKdps=; h=From:To:Cc:Subject:Date; b=AKIQtpZRB+WaB0CvN+N7P2x0XEPEkRxNSIAmoqQzunlk3LRSpZb+8dxD/Dqxa/rKP z45hW86j4pTXYed+34IgM87/Bb//+72CunPh6LkSfeNREJlDT7gq0Q313Vhgi0SpVa fqxdbsny1mvzZv/K1pX9sjHzPakiOT0aEA+Vqtp/H8sZ3HkhP/1q+oQ+nlk/el4dye fCQ4ZXGFLSrz4vI50FHMTtL4y04+BKzSChc5X20nvXqkC6xUUmtppCPkTMYsB0udg4 q+ome3h/qIA9nq50fY1lgYP07m0uQmfm0cTFy4W3ki3IH4R4c0Od/tiyCHrP6nVhEb nhYn6h+QX7Hgcz0rraSc/m6SDCqeXn6UVa89mu/yHeTC7lAAtyJSK0eC2OW8abU03i MUaVK6hcCWTLHxvLRYYLE7KduPywDkRc51R6UX3SW0TdwUIx5h4SY3apJjqIG9BNue cwigr3KJJzCP5a5whzS+3OEwCvnkZ8UT4ZyYEIZ1fPMDtGauBJGR8ZBq0xpFz1HF4Q Vn9oeh/PLpg7FFFzvMH+Ra8a5CVA5XqXutCmVZI0odLKr8KsgM9GCudVnpfxLcSz2F BfjqwzptAkiyEEMNJqh3yqdmqIOyYQdJvxJow2hmKaJnzkMZnINgjwov+tB74X9QJl FBmOUZJ4FEPcYAqOHq12IhF8= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 6ABC937EB66; Sat, 22 Mar 2025 16:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662117; bh=+MvHkwy/ajJE9yDgNr7XrWltU0l1EOOAs4r1cMrKdps=; h=From:To:Cc:Subject:Date; b=ppR6T3XCGT3DAx8xCPf02a3k8iqnzWw9ra3wPDrFqDKSy3Sb+cQ7BUrQT8D+/np3M oQ9eEPQSg8ag3q/SF0UUujmKU2qlrNjJDRTWsYGJty0H9RkOCsLpUrOPbvfZLGCDR+ nIkVDEttUh0Fo2NYcFTkZOXgvAi3//igBW3bSthdZNxHbGNCXwHDXXdKtLNcElcyRd fOnpGOLhW8t15t1NxivEIcqoO6O7hE187W914o979OmfoSxa4wmz3zVjp0ozgzPs8y CVBM+lcTDldzDGQiqsW7/ptHruHidvI2qE8ljoJlYEEHP030lAtiRv3nGFO+zr0cIC gf96ehxrUmittmcTl2oIgRQrCVuPA+Mtj0+q/CaK2bWRVBhA5gmBCnTVRxboKlHTtS cBxR5hcJclccIWqtiwcb3w28XK16TueKXK79XuIJMqM7K5Tl4eUqjHm1J740GXnQy7 x4/Kjq/JgtWL2clZWk20HBlCf8V30ZPUTopCpoJkeFYslUz4dShJ8MywM/pUj/HJMm vLG7GZf4wT/A5dCh23AmkiqAHGd0CyFBCF0FOofda3661w37/uAafaXUoC1ai8FMQs sEN2C3HSi7y8CN6FbAyThL5QhJPO5m0xzGXc4L4LZg3niiivAvSrGyBsImpTWMCwo/ 1LrkVFmigKp6kAQwZInUFroM= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 17:48:31 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) 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.0 (/) Extensions and improvements for the gitolite-service-type. Tomas Volf (13): services: gitolite-rc-file-compiler: Switch to match-record. services: gitolite-rc-file: Add log-extra field. services: gitolite-rc-file: Add host-name field. services: gitolite-rc-file: Add extra-content field. services: gitolite-rc-file-compiler: Set mode of the generated file. services: gitolite-rc-file: Export default value for enable. services: gitolite-service-type: Do not install gitolite package. services: gitolite-accounts: Convert to match-record. services: gitolite-activation: Convert to match-record. services: Add gitolite-git-configuration. services: gitolite-git-configuration: Add default-branch field. services: gitolite-git-configuration: Add receive-fsck-objects field. services: gitolite-git-configuration: Add extra-content field. doc/guix.texi | 41 +++++ gnu/packages/version-control.scm | 5 +- gnu/services/version-control.scm | 302 ++++++++++++++++++------------- 3 files changed, 223 insertions(+), 125 deletions(-) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 02/13] 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: Sat, 22 Mar 2025 17:01:02 +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.174266284625422 (code B ref 77186); Sat, 22 Mar 2025 17:01:02 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:00:46 +0000 Received: from localhost ([127.0.0.1]:45071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2DF-0006bo-KA for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:46 -0400 Received: from wolfsden.cz ([37.205.8.62]:44868) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DB-0006ad-Gb for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:42 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id E693E37F2F1; Sat, 22 Mar 2025 17:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662839; bh=Doi5KlkP0mRtaG1+kohkb7GbOsx9PaqVgsoSKXddhHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=afIveXTpg9+M2A9tp0ogVUQ5rXoF2DzSpleAhmxjm9PzyaDSG4ZFpdhXLtUKVR1dz YBl+5bE4d4Tz2s3JKVEYtOIGEMeZsan7RpTFtdM7GfopPFiKn4fGepAEnHTfOU8xt6 wc1ekHXEp97IzyWc7qP3d/Iec6RJh8I+kvQSolfYnhXKYGF3pr3zcflUxxHjpMSoDA +cdx259DaZiRWRd4tH1UFMya+VaGBaRCf8g3gP5A8SSQrpm9F1KH7aL0Z0+1LVlq4r DDZxWYyCIrD0UJXN+hjl9GudzGr2U5bKXHR44yqBiMmhkllRrW2/SiYROOMiWiKOJy 5IIWXgeOTSYuPjJcDpo3OfTJfS/2Nfa/hNtx+tVehJFbsJAHtnXhASrOkLLCfBLuhj 1QRCbPsmnTjOfEUVltmTwYUUbw3xaQq6qHNZLWM4RjZMJhM5TwbSTHaRAKutSNe7ve /bkqXIalghvfMkckpWBgoDM0kI7cHCn3EbMXdagdRAaycR4O7eLoFYcdj/XN9pJJax N8oaty+DOLab4z4YeR305YhJPBSLmOk5PteIjSC4UiDvG8iULCbVrNI8lL5f0UpWAU PGvWZb7G/2UW6/LShdvjQP/QR1z7Vbw3xEli1/BpZE9Wlw8jhiu2mj7lNI+afIN+hZ 1PQNch4RCJdz930VXTpxRH/w= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 7CD5F380495; Sat, 22 Mar 2025 17:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662839; bh=Doi5KlkP0mRtaG1+kohkb7GbOsx9PaqVgsoSKXddhHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=afIveXTpg9+M2A9tp0ogVUQ5rXoF2DzSpleAhmxjm9PzyaDSG4ZFpdhXLtUKVR1dz YBl+5bE4d4Tz2s3JKVEYtOIGEMeZsan7RpTFtdM7GfopPFiKn4fGepAEnHTfOU8xt6 wc1ekHXEp97IzyWc7qP3d/Iec6RJh8I+kvQSolfYnhXKYGF3pr3zcflUxxHjpMSoDA +cdx259DaZiRWRd4tH1UFMya+VaGBaRCf8g3gP5A8SSQrpm9F1KH7aL0Z0+1LVlq4r DDZxWYyCIrD0UJXN+hjl9GudzGr2U5bKXHR44yqBiMmhkllRrW2/SiYROOMiWiKOJy 5IIWXgeOTSYuPjJcDpo3OfTJfS/2Nfa/hNtx+tVehJFbsJAHtnXhASrOkLLCfBLuhj 1QRCbPsmnTjOfEUVltmTwYUUbw3xaQq6qHNZLWM4RjZMJhM5TwbSTHaRAKutSNe7ve /bkqXIalghvfMkckpWBgoDM0kI7cHCn3EbMXdagdRAaycR4O7eLoFYcdj/XN9pJJax N8oaty+DOLab4z4YeR305YhJPBSLmOk5PteIjSC4UiDvG8iULCbVrNI8lL5f0UpWAU PGvWZb7G/2UW6/LShdvjQP/QR1z7Vbw3xEli1/BpZE9Wlw8jhiu2mj7lNI+afIN+hZ 1PQNch4RCJdz930VXTpxRH/w= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:22 +0100 Message-ID: <2760c726fe70f6622ad770ba3e2b755489e8f66a.1742661305.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 bcb1f9d9cf..3179d33cb3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41147,6 +41147,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 e73833713e..2e7448c33b 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -59,6 +59,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 @@ -251,6 +252,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)))) @@ -268,7 +271,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" @@ -276,6 +280,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) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 04/13] 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: Sat, 22 Mar 2025 17:01:02 +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.174266284825442 (code B ref 77186); Sat, 22 Mar 2025 17:01:02 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:00:48 +0000 Received: from localhost ([127.0.0.1]:45079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2DG-0006by-Ge for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:47 -0400 Received: from wolfsden.cz ([37.205.8.62]:44900) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DB-0006ai-W1 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:43 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 08469380D80; Sat, 22 Mar 2025 17:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662841; bh=mEL3dNgOsoqOjKopquC6/Gsjkapz6KdiLYejp7Ezjsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F53E7g3I2Wi+l8EAsZG98ZxvaOEFw8oBNPJZ3gn879inecN7VWBCsDUCHwUqoe54h lNKU6r1aRzYSdSqDeXWFRbTAAxg7cx5bjo+Y1GrFntIOulbTnDeXpUHdmMEz5CKzYh pJaRZMjKQ2HFjcU6p/Hyv78QVKkuZdBrIKhK2mZmpKVhi9bvQLHE8SJI0rnAlVzf3/ K9s13+y+Lb1zy49z4Qs4l6TwBogia8l6NtvqnpYVgWRx8Zhd6GghxPt1qef5LsYrjB UycEsfp7dzGbFpCepzaixZ1VDlNK2blTEZPrEMYHQbtFma2TsbdgH89NmEKiL9Wat1 rVwEvMJ3abRqyj7yF400JE3xi2DRGFOQtR8w31e7feA8Awajs06WzXScLqXksTqa8V te6OLebepQUw6JXHkGxrvIiXl6I1dxlS3FqVE74b3IQFdOrUNF27NAMCmimJutFmoG f1OwjaBnOH/A/7zkP59zfFGc7byQbA92iqko4U6SHIUMbD7r9z8aagLT8Rh13JNuXY 3QkOXeTlOHG4JS0TCOJPXmcy5hNoJI8oqM2D/8F4SPLDGylAiNpCRPpmRjtV8VXJeN vg+AcF+h9xHFdyTDhVXeQO4hlVJ/Znekr160irfBh0ErQxGRW2Qu3OzTppHX1viNal yucU+xKD8JE3C5bvJAQzaAZ4= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 875EC37F0DE; Sat, 22 Mar 2025 17:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662840; bh=mEL3dNgOsoqOjKopquC6/Gsjkapz6KdiLYejp7Ezjsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZO838jp6VqVR5aVLMM+V3CwHpUyiVnfklayF+BJX23uNaKGe6Q6ty84NGTAwYDQWc hM5WLngRk/vOKzWLSiU/lRMU2pmG47Nq55nIS00N2K8rj9JaRoDWOkitLawYHU4WBh Q6pg2CB6qzHnTIES1IjHD72Z7W1sXBz5jhFVthH7kuDlB/pJgQ9iiynam8LK8r8rlh WroeuSIfEjn7ftkLESLNi3mZACV4F4KB906/PF8q8lj23ziawch6xXbL0GzFEiRWD8 GoVZt/moP4XX9I7spg2ueevpCExSEGIwY9nMKFl6ohEOYaKpyMIcQndcoI/oF2l44P uoay/XZ98p79SFqF4ob1AChLzK73YugeEXC8EqedpxOT1eSQUrD6cblMHV1loIMK4V ftA2x8jtmJPEK/n2jMwSAuDjaWQnW9j9V96HXFq3lXO9xZWKsPmFq6R94C+ettrwB8 qS4n9cmsedA2iWY/Jajmw7NIM46Uowe4EHwhiEkVA9kW/xny/aWS/cAb0jSrM1zTBq wOknSJ+D2WZ3Q8NXz/SGareYERXQ0A3QaCfB11KKFdY+xl+/nQSXr6ozfCRMuNUXao wAlbHvEdxZuPN5qn2CpRZ73cjmJQLUG6sorBIxnC2c2ogBD7JrHvN8HB1/EF42nVsJ krkg6L4cQ83LfJNUfgRnN7yY= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:24 +0100 Message-ID: <7d4597f2c662e28522c238071c4ce59bccb14db2.1742661305.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 2c7ddb2f55..e60fef9673 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41164,6 +41164,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 52f260f708..36513e0343 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -63,6 +63,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 @@ -269,13 +270,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" @@ -301,6 +304,7 @@ (define-gexp-compiler (gitolite-rc-file-compiler (simple-format #f " '~A',\n" value)) enable) " ],\n" + ,extra-content "\n" ");\n" "\n" ,(if unsafe-pattern -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 01/13] services: gitolite-rc-file-compiler: Switch to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:01: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266284925458 (code B ref 77186); Sat, 22 Mar 2025 17:01:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:00:49 +0000 Received: from localhost ([127.0.0.1]:45084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2DH-0006cJ-VR for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:48 -0400 Received: from wolfsden.cz ([37.205.8.62]:44860) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DB-0006ab-G3 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:43 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 59722380494; Sat, 22 Mar 2025 17:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662839; bh=A3YQSqoXt2ioJxHjsd1Re/ReemXnAVGjJ1UiKrT74q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LYU7rqsYJRLe92E7pBy0aEhxh5/NT4/2AKwzIw8MqtXp34z/CtJ+HPanyLwUs9jOE pPjyzFLBe1lS2t4YRIqrsPSIiTPPaXHb+FxPachqn1P6YSkQ7Mg1AIs5qBuOMXG03q zzCxMDcgMSlmlQyjiPU03RzN/zPGp0svaEvLeKORkKmMb9PnX+snRIs6SthFPZ5SB6 ydaNtmeQrZaAOJ+ap6b5eKGecUSiC8fY3FdRvbVPwT3pNWUxNRQ4F7J8H4wlwfUI8+ +/QKKjPf+ZsBB0DMI1BVaLMCdBNTgnGnBA4H1jUErO/x/XrL3JnaUsYd56RmU1TlfN OO4ETYdR3ZC9ds1eDdnHktlnQlKFxgTrLghTjkSGIp9mklih5L6Li9sQbXLgW2hee4 uJXR5zWpz03XD1BMPs7+qMmVd9ZDP0X5/uvfpOmvtGC5lwtvtKiwChTcxVTeLNcXQA Z+XKQpL1IP24ZKfn7cL1fG/AehUHhC+A+hLgJ38ft08r5YftdQwccrsicrZGtc/BKL mRmyY8K6qk/c4CBbKGw/u8GG7ZpMAVE1dbqT3XKesyO7FzRh5rkS1oZRnBRVCo9jar 2YYVWMobwYiUzpj7i9ZZb3WcGDMgsRSPh7B/AlVUixB84eLhW/eTtQTw/Q436ZYT8K tpHimfawHGWLWCgSiXBnmYSE= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id ED8F438070B; Sat, 22 Mar 2025 17:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662839; bh=A3YQSqoXt2ioJxHjsd1Re/ReemXnAVGjJ1UiKrT74q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LYU7rqsYJRLe92E7pBy0aEhxh5/NT4/2AKwzIw8MqtXp34z/CtJ+HPanyLwUs9jOE pPjyzFLBe1lS2t4YRIqrsPSIiTPPaXHb+FxPachqn1P6YSkQ7Mg1AIs5qBuOMXG03q zzCxMDcgMSlmlQyjiPU03RzN/zPGp0svaEvLeKORkKmMb9PnX+snRIs6SthFPZ5SB6 ydaNtmeQrZaAOJ+ap6b5eKGecUSiC8fY3FdRvbVPwT3pNWUxNRQ4F7J8H4wlwfUI8+ +/QKKjPf+ZsBB0DMI1BVaLMCdBNTgnGnBA4H1jUErO/x/XrL3JnaUsYd56RmU1TlfN OO4ETYdR3ZC9ds1eDdnHktlnQlKFxgTrLghTjkSGIp9mklih5L6Li9sQbXLgW2hee4 uJXR5zWpz03XD1BMPs7+qMmVd9ZDP0X5/uvfpOmvtGC5lwtvtKiwChTcxVTeLNcXQA Z+XKQpL1IP24ZKfn7cL1fG/AehUHhC+A+hLgJ38ft08r5YftdQwccrsicrZGtc/BKL mRmyY8K6qk/c4CBbKGw/u8GG7ZpMAVE1dbqT3XKesyO7FzRh5rkS1oZRnBRVCo9jar 2YYVWMobwYiUzpj7i9ZZb3WcGDMgsRSPh7B/AlVUixB84eLhW/eTtQTw/Q436ZYT8K tpHimfawHGWLWCgSiXBnmYSE= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:21 +0100 Message-ID: <9c1e4968f7f9e7faaa80212e3b08dd0e924b71df.1742661305.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-rc-file-compiler): Use match-record instead of match with $. Change-Id: Ia2f4985e921aee5f8859d1858f7c186b707d7a36 --- gnu/services/version-control.scm | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 06b6ff224d..e73833713e 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -267,33 +267,33 @@ (define-record-type* (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) - (match file - (($ umask local-code unsafe-pattern git-config-keys roles enable) - (apply text-file* "gitolite.rc" - `("%RC = (\n" - " UMASK => " ,(format #f "~4,'0o" umask) ",\n" - " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" - ,(if local-code - (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) - "") - " ROLES => {\n" - ,@(map (match-lambda - ((role . value) - (simple-format #f " ~A => ~A,\n" role value))) - roles) - " },\n" - "\n" - " ENABLE => [\n" - ,@(map (lambda (value) - (simple-format #f " '~A',\n" value)) - enable) - " ],\n" - ");\n" - "\n" - ,(if unsafe-pattern - (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") - "") - "1;\n"))))) + (match-record file + (umask local-code unsafe-pattern git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + ,(if local-code + (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) + "") + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + ,(if unsafe-pattern + (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") + "") + "1;\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 03/13] services: gitolite-rc-file: Add host-name 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: Sat, 22 Mar 2025 17:01: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.174266284925469 (code B ref 77186); Sat, 22 Mar 2025 17:01:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:00:49 +0000 Received: from localhost ([127.0.0.1]:45089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2DJ-0006cZ-09 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:49 -0400 Received: from wolfsden.cz ([37.205.8.62]:44884) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DB-0006ag-HP for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:43 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8E01D380221; Sat, 22 Mar 2025 17:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662840; bh=0Y4kILm6o1VyeuGxCgVPCSVV49Qx+/X/3s9muv4uqc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wQM3efejnnZ2jWlWUbcTsdClqdagjfkt51XFTaTC3EZ8MINPjGJvXIFZIQ4dkFd18 ztN34gVEmaA4B+40hptbUSDhDH4lq/WDhrlA2+skBZhk1AX6zO14VO2vXhrtVo0wMO D66VyufHQ4jwWqB3ULSts1Fq9F1mff416vzH5mmFer/ttvIhEvB9nMifrSMjDDpt9M 3PAnWDqxmo0lscAzkQ9v+IY0XE83XJ19zy83aIYw7c7TIigX58s26icgZLU5Wcyavw wOtq1u8gqQI+qI5V+SiX3ssSC+bQN6RXmRfCeLkzM2GKvhYmdJGa3fG13XGQh+92iq Bmjni1mxXZNOKDHMFwD6NoLuUMeeXyKFRDlrVQpIrt+O7qqGRmsfv2MRSKC+hov87m EWAFcc+r95O2dTyENbGKd/xNLsN7h5iqtOomInLkZMad9vxom10eoNmrOWLLmtq5eZ 6Zo/1SDiZEybRctVCGq/GLqg5PdF8SI9vQfxdRlSWAWDglClsrYIl8o5OggE7Z/8Sw +496Mq6xbnYAgmZeQmoaQV/uWarJcGvcVmLbmARhkaOyqG1p8apKMqnN6e1elCytuz d7lePOjiTqkwosJCvB+gJ1pmrvLkzq21w6Vzfr31TKs7rQVQLFXuA7+KIeKHp6PWEh tuFQavEFm09HqrOAHWrZgyrw= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 07B3038058F; Sat, 22 Mar 2025 17:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662840; bh=0Y4kILm6o1VyeuGxCgVPCSVV49Qx+/X/3s9muv4uqc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wQM3efejnnZ2jWlWUbcTsdClqdagjfkt51XFTaTC3EZ8MINPjGJvXIFZIQ4dkFd18 ztN34gVEmaA4B+40hptbUSDhDH4lq/WDhrlA2+skBZhk1AX6zO14VO2vXhrtVo0wMO D66VyufHQ4jwWqB3ULSts1Fq9F1mff416vzH5mmFer/ttvIhEvB9nMifrSMjDDpt9M 3PAnWDqxmo0lscAzkQ9v+IY0XE83XJ19zy83aIYw7c7TIigX58s26icgZLU5Wcyavw wOtq1u8gqQI+qI5V+SiX3ssSC+bQN6RXmRfCeLkzM2GKvhYmdJGa3fG13XGQh+92iq Bmjni1mxXZNOKDHMFwD6NoLuUMeeXyKFRDlrVQpIrt+O7qqGRmsfv2MRSKC+hov87m EWAFcc+r95O2dTyENbGKd/xNLsN7h5iqtOomInLkZMad9vxom10eoNmrOWLLmtq5eZ 6Zo/1SDiZEybRctVCGq/GLqg5PdF8SI9vQfxdRlSWAWDglClsrYIl8o5OggE7Z/8Sw +496Mq6xbnYAgmZeQmoaQV/uWarJcGvcVmLbmARhkaOyqG1p8apKMqnN6e1elCytuz d7lePOjiTqkwosJCvB+gJ1pmrvLkzq21w6Vzfr31TKs7rQVQLFXuA7+KIeKHp6PWEh tuFQavEFm09HqrOAHWrZgyrw= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:23 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add host-name field. (gitolite-rc-file-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: I1231ed47a294ff48b35a301f76ae8e9cbfcd9b95 --- doc/guix.texi | 4 ++++ gnu/services/version-control.scm | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3179d33cb3..2c7ddb2f55 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41154,6 +41154,10 @@ Version Control Services value from gitolite however is @code{1} (written as @code{#t} in this configuration). +@item @code{host-name} (default: @code{#f}) +The host name of this gitolite instance. It is used by the mirroring +feature. + @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 2e7448c33b..52f260f708 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-unsafe-pattern gitolite-rc-file-git-config-keys gitolite-rc-file-log-extra + gitolite-rc-file-host-name gitolite-rc-file-roles gitolite-rc-file-enable @@ -254,6 +255,8 @@ (define-record-type* (default "")) (log-extra gitolite-rc-file-log-extra (default #f)) + (host-name gitolite-rc-file-host-name + (default #f)) (roles gitolite-rc-file-roles (default '(("READERS" . 1) ("WRITERS" . 1)))) @@ -272,7 +275,7 @@ (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) (match-record file ( umask local-code unsafe-pattern git-config-keys log-extra - roles enable) + host-name roles enable) (apply text-file* "gitolite.rc" `("%RC = (\n" " UMASK => " ,(format #f "~4,'0o" umask) ",\n" @@ -283,6 +286,9 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if log-extra " LOG_EXTRA => 1,\n" "") + ,(if host-name + (simple-format #f " HOSTNAME => \"~A\",\n" host-name) + "") " ROLES => {\n" ,@(map (match-lambda ((role . value) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 07/13] services: gitolite-service-type: Do not install gitolite package. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266286825556 (code B ref 77186); Sat, 22 Mar 2025 17:02:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:08 +0000 Received: from localhost ([127.0.0.1]:45098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Db-0006e8-Rt for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:08 -0400 Received: from wolfsden.cz ([37.205.8.62]:44904) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DD-0006ap-Ej for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 7AA4A3800B1; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=3eUo/1HUVaiIZp+QDwp2QAb7kYZ6Us72bagdz3/zBSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BPlxoBj0rBZMmbkIagcvTO6PLxQ2BeMCjl9SbVmgrfN3jYJto7V73XeAZqDg/z2pf 9h4Oj9ENW202qkh9QfYn1yYn2IyalcjJccI+ANE/ZEC29QnsoiUxsl8fhOHohJzANg PvdwP0/4yjyGjGabv9V5HYcmTy8DiIxub2z+JId1bf37IpOERpL75sVQ4YWrOsoJGh BY6RehxwUPbMmaaafgDz9zZx+UNdlPH8O+PWEIGpui/UaP0Do5ia89NkwsK6JdNHRi dQ3reg9KD6N9z9tr+2YZpFb1z+mT7hN/1U43Kw3n3fhnRhxMs8W6pKvjeKG+IMAw/C /bHkpeiSID56S6vkF0cxiDuhc30n2zjs5PjyukgZ49JKRbxOHFvN+gwYw9oktHeaQH pJ8V7lVYeZFLNPTv9DcwzCvDT2B5H6f+xiR8J0ZnjTNRTqjbVy5vdjCn1LMCGHi/Vg gZywpxvJ38URyGC8cRNtSuxo1gcDgvhd3AF61HAKyifACbCfbIhKPp1Lq392oLqvOr AkdlQTt+JM7Qy5Rptw4KIdWn0cCs9d+T8rPH0IxpCNcoGyM7lUuGa3/tJMbSt3WpCY wYT7M60h0hJmDa41Lw9pqynLLD1Lmq11+UA+nmmf+yfAC6jHF09lPIH9Zy6Q+/owFT OtkEFIePthsNPqyThFEuUjmg= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 0D4D4380137; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=3eUo/1HUVaiIZp+QDwp2QAb7kYZ6Us72bagdz3/zBSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BPlxoBj0rBZMmbkIagcvTO6PLxQ2BeMCjl9SbVmgrfN3jYJto7V73XeAZqDg/z2pf 9h4Oj9ENW202qkh9QfYn1yYn2IyalcjJccI+ANE/ZEC29QnsoiUxsl8fhOHohJzANg PvdwP0/4yjyGjGabv9V5HYcmTy8DiIxub2z+JId1bf37IpOERpL75sVQ4YWrOsoJGh BY6RehxwUPbMmaaafgDz9zZx+UNdlPH8O+PWEIGpui/UaP0Do5ia89NkwsK6JdNHRi dQ3reg9KD6N9z9tr+2YZpFb1z+mT7hN/1U43Kw3n3fhnRhxMs8W6pKvjeKG+IMAw/C /bHkpeiSID56S6vkF0cxiDuhc30n2zjs5PjyukgZ49JKRbxOHFvN+gwYw9oktHeaQH pJ8V7lVYeZFLNPTv9DcwzCvDT2B5H6f+xiR8J0ZnjTNRTqjbVy5vdjCn1LMCGHi/Vg gZywpxvJ38URyGC8cRNtSuxo1gcDgvhd3AF61HAKyifACbCfbIhKPp1Lq392oLqvOr AkdlQTt+JM7Qy5Rptw4KIdWn0cCs9d+T8rPH0IxpCNcoGyM7lUuGa3/tJMbSt3WpCY wYT7M60h0hJmDa41Lw9pqynLLD1Lmq11+UA+nmmf+yfAC6jHF09lPIH9Zy6Q+/owFT OtkEFIePthsNPqyThFEuUjmg= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:27 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) It is not ideal to pollute the path with the binaries from the gitolite package, so adjust the package to support that and the service to no longer install it. * gnu/packages/version-control.scm (make-gitolite)[arguments]<#:phases> {'patch-scripts}: Use store file name of gitolite-shell. * gnu/services/version-control.scm (gitolite-service-type): Drop the extension of profile-service-type. Change-Id: I25459ccd80bda892b6d188b2b6fa99baee339cba --- gnu/packages/version-control.scm | 5 ++--- gnu/services/version-control.scm | 10 +--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8f244e0fa..e06ac79506 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2365,11 +2365,10 @@ (define* (make-gitolite #:optional (extra-inputs '())) (string-append " " (search-input-file inputs "bin/grep") " "))) - ;; Avoid references to the store in authorized_keys. - ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") - "gitolite-shell $user")))) + (string-append + #$output "/bin/gitolite-shell $user"))))) (add-before 'install 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; Gitolite uses cat to test the readability of the diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index b3196199e3..5e217ed170 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -428,15 +428,7 @@ (define gitolite-service-type (list (service-extension activation-service-type gitolite-activation) (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) + gitolite-accounts))) (description "Set up @command{gitolite}, a Git hosting tool providing access over SSH. By default, the @code{git} user is used, but this is configurable. -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 08/13] services: gitolite-accounts: Convert to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266286925565 (code B ref 77186); Sat, 22 Mar 2025 17:02:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:09 +0000 Received: from localhost ([127.0.0.1]:45100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dc-0006eE-HA for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:08 -0400 Received: from wolfsden.cz ([37.205.8.62]:44916) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DE-0006b1-08 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id DE0403800B2; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=bXUlsUc261gd1efYjrPk2rAyfHuaOVVV5Y5LGkGQByc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UU62AX7lawsqefGjKBUiqpLBMWR7n8qu2CF/JvuZvL8VXxgxw+XWnEVhRyaWAgq2Q FWm+ObikGdQvR3hA3N6c7iZQvYtVaMEA6NUa+lmxInq3SPStPTr9DwvW9MGKVu6QB9 mY9eBjfwUXFIvtjI8AxfMTxqMhQCIpqRfa/YuEw4m71D2Dfspky2OWY7NQ43Jbo+nI GuhgEoubT9gHgkIvTvBLjZ1xpXX7buHYZSx0HKvTmjpBNAS/i5Vt4owY0NDbUAqgOj xQ70F1XlYqSbJtdrXqPcAb782OKZsFrQYYUolOILCfBWAN8GVnzPcyUBRETEI+jCjy qqSf1yKbVDmzgdzy2i03u2w5mN2uYeBcxBIPrUcBREoIyFqYQYXMGLlrAGtnOKQQw8 x9vGFNJc4Rs6hJWkCEHuPck2v7daqCBFTHqf/Buwu64nuJIWtwf7D1IJS8w4SiFWH6 SLvVfg2FqL5yg1feh50Fa10ZGC3CnVq3Y7YFJlonIz/fRU9wxrPgAGAd/IRzaZo652 bpOpuF/8TP7dGju6X2QngeOlvUrqfLnKASNBM2w5s1dC2zyrmFZhIZ21ZjAghFtpPt TuWlHXabEr6Wz0fzj37UKx/CmYUjjRf2i1l1Iai0L4qyTRwHrmE2EWSdk71UWAj+Xe UDy47SBMRO2+XckrJWZZqero= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 869E338062D; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=bXUlsUc261gd1efYjrPk2rAyfHuaOVVV5Y5LGkGQByc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UU62AX7lawsqefGjKBUiqpLBMWR7n8qu2CF/JvuZvL8VXxgxw+XWnEVhRyaWAgq2Q FWm+ObikGdQvR3hA3N6c7iZQvYtVaMEA6NUa+lmxInq3SPStPTr9DwvW9MGKVu6QB9 mY9eBjfwUXFIvtjI8AxfMTxqMhQCIpqRfa/YuEw4m71D2Dfspky2OWY7NQ43Jbo+nI GuhgEoubT9gHgkIvTvBLjZ1xpXX7buHYZSx0HKvTmjpBNAS/i5Vt4owY0NDbUAqgOj xQ70F1XlYqSbJtdrXqPcAb782OKZsFrQYYUolOILCfBWAN8GVnzPcyUBRETEI+jCjy qqSf1yKbVDmzgdzy2i03u2w5mN2uYeBcxBIPrUcBREoIyFqYQYXMGLlrAGtnOKQQw8 x9vGFNJc4Rs6hJWkCEHuPck2v7daqCBFTHqf/Buwu64nuJIWtwf7D1IJS8w4SiFWH6 SLvVfg2FqL5yg1feh50Fa10ZGC3CnVq3Y7YFJlonIz/fRU9wxrPgAGAd/IRzaZo652 bpOpuF/8TP7dGju6X2QngeOlvUrqfLnKASNBM2w5s1dC2zyrmFZhIZ21ZjAghFtpPt TuWlHXabEr6Wz0fzj37UKx/CmYUjjRf2i1l1Iai0L4qyTRwHrmE2EWSdk71UWAj+Xe UDy47SBMRO2+XckrJWZZqero= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:28 +0100 Message-ID: <354d02073ce991dcbfc794798e892840eeba7888.1742661305.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-accounts): Use match-record instead of match-lambda with $. Change-Id: I37e3018513a8f20eeed8614dff46a63b8d7c2883 --- gnu/services/version-control.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 5e217ed170..83391c15d1 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -335,18 +335,19 @@ (define-record-type* (default (gitolite-rc-file))) (admin-pubkey gitolite-configuration-admin-pubkey)) -(define gitolite-accounts - (match-lambda - (($ package user group home-directory - rc-file admin-pubkey) - ;; User group and account to run Gitolite. - (list (user-group (name group) (system? #t)) - (user-account - (name user) - (group group) - (system? #t) - (comment "Gitolite user") - (home-directory home-directory)))))) +(define (gitolite-accounts config) + (match-record config + (user group home-directory) + ;; User group and account to run Gitolite. + (list (user-group + (name group) + (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory))))) (define gitolite-activation (match-lambda -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 05/13] services: gitolite-rc-file-compiler: Set mode of the generated file. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02:04 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266286925571 (code B ref 77186); Sat, 22 Mar 2025 17:02:04 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:09 +0000 Received: from localhost ([127.0.0.1]:45102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dc-0006eI-TP for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:09 -0400 Received: from wolfsden.cz ([37.205.8.62]:44908) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DD-0006b0-WF for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9432B37FD22; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=/k4g1FIdWimnz9Eu3KTjznY3yf2Yq1N8rMHWqHosTQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uBXlVTiCEARyo0yePPtDapBdzXxdmk0yhB1sPqyVA+HDslSlo6qojnkixgx35uuin K4JgRjt26Kv1rrl8O9JielXqdkRf6+ILI9/TAP49YxiL1M+o35QB0vMrtXg/kf/9qP qkEdwqGHdq04MCMfZRWKGPV/WTtfTfEPkEclVG9VR/Vbn+kCCa33foeQfsr2VO3Ri0 Ew49w7rHiYU68hUJuZptUWHab/FV+P78vavo0mt6MKgRXCLwC3spshQeU496laipLY rSKiYyxcsn6443BaggSAizZ3IVDc1fmbLfAxM3eCRIU3mZjL2y+/uR4XSdYfxyEgmo xoWOTak+dJRSZqlWoJZ8PRYjQi1NOaLvGy9e8p1KbLRH1ueGkXJTR6yZn7JQgobUJG /kiT6XsX1gVCPROyPZTaWS6AswxNnRudXv06t+j89afQjOO4U+x1EUOKDbSW1uEmzJ X3MZE+yXribT7aCMHYT53Nr2cTSXa2LEyNr3luwymE6jO+1f1W6FmP7I/5PoV0byRo 6htsMXey7liczzoAdtv3cbWVF21qgQ+IwdSyWzETdNkRXrS8oT5tNS8wA5OYkpCGKO qh1nVjG7sS7sh4+ycI/hZXY0Obn+YKV592pNW/WP0iqbQX0u94Hm0a68cFpsfDMemd c19s/nMDQvqEb9kozWr1TeIo= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 0DAAE3802FC; Sat, 22 Mar 2025 17:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662841; bh=/k4g1FIdWimnz9Eu3KTjznY3yf2Yq1N8rMHWqHosTQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=por+Z4SbE6wIqZTaejsAP6jiBjlEZhvHch1QFAkcMZb0r/iqmIOFfjp0f3CJyjmrB 0SmJ75FduYvtN/dRB9FDTMDcNVa/7LRZyrqTiJ984P7Nl28j0NYMib39TA7rOPK224 Tsz4RlCg/2ajjNyLv+Hp0qu1wDoAwkENkiW+fp8y4Ac/X/W867cW9LHb01T+HHsLsP dD1ktn8mh3IEuVE75NvuCEwPGH6voIMMLfMPpTZ6YDZNT1zrrUTpaJWBzkvw3ZtNCz nUFDe4wbURJX9MQFXRK6lDjnSbXjN7D5R+6ziFmRhEknwtIgRse2sBFQ9dOHAU3tTb tfYe8dM/0FdoiUTxFMRGilbxCUVsBuP5MARK5NEblKX7o4dnt3jEM593/0E4swCc7Z UXSPl6eRU20XLuMTjcXIMDV20v23c1wZcKbdKnsMBIHpmXBvZl2isVemIJ6bPI9mvA Lj/nDrF0ZLVlh7mm7ubtyfNUoH9DUEufiqyDxxg59/an2MUhTH/1AfwjcUKrZ3ZHKA uL0DriNeFxoZ2cuhOpUKutsMjvllzEWoYICAjFrFc4WlQB0eJqYrAZQRiMLoSnPAuA a8MuW+XMm5loehoMmQRaJPX7N8ia3RtScyp4AnI8W5ZsZCF8Wuu2LJciJwc6x6LWfE 1TwzDXRiPbVCH2fFTJnJATRg= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:25 +0100 Message-ID: <4e4cc8f73b944f9e0acb23cf7f3a2362ae0e4108.1742661305.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) Copied over from the official configuration file, this sets a correct major mode when you visit the generated file. * gnu/services/version-control.scm (gitolite-rc-file-compiler): Add local variables. Change-Id: I8a9d794a1e3c7049ae606165cf939d81b5dbdf6e --- gnu/services/version-control.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 36513e0343..6ee81eefe4 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -310,7 +310,11 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if unsafe-pattern (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") "") - "1;\n")))) + "1;\n" + "# Local variables:\n" + "# mode: perl\n" + "# End:\n" + "# vim: set syn=perl:\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 06/13] services: gitolite-rc-file: Export default value for enable. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02:04 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266288325603 (code B ref 77186); Sat, 22 Mar 2025 17:02:04 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:23 +0000 Received: from localhost ([127.0.0.1]:45104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dr-0006es-C5 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:44926) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DE-0006b8-8E for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:45 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 068CA37F768; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662843; bh=R/4F/wHtxfPkv6MWhaljJS3RA5NEW/fbEX4QiDc4jLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Fs8jQ96FOBqxQ84SnQD10yc+qJAOPY3TfQartiDBUjjfJHTEqmUIRoOqRcU5xuvzn FQmx7AGk9nEXPalUi09RVkZX52bnPPdhpKNKHM/WI+e2NW6LqWphKoGfVBzxJCDAwy UYVpeV5iZM0sYM/uprJuvtZEZlgj912N2IVXUAc2wDNSlsLMAhMY56U1kVj/qAJhwm v/rpnJbZgilJCh34Efe+yGsiYQc/87f0SzyukpEd1HSCyYqrt2d2w7keMbUoKO6OyU rquGDdi2aHdUeIVpJJ2lRr54kgOJTGrvhE82EgbTHOupdlGOshRRX7GhuadA7A6bQx 8FnxYT4Hu3ogKnO10Zk2SxKBe9IMKEHgAJc4SVZm+7aEEf3gW5voWnEtxE26BepFjq Z9li2324qRaDpeL3Q6g2b7smt6ckABwPX5tCtrzD7cuGFpnomU6oFCqqaG8gzZoSHj DzbLEzPEZNiMgASt1C+6mfCEv/uU5vMAvQ4MEukvnqEfAt4d/u6n9g/pYhC5anCVe5 nvVbnj5/QZaApE2TBJ87k63nlgTy/t0FM0cA7GFemtOl4kpPPvSw421GT6ZbIrJ+XA kYZzXhzzVTnB8TBmZxeuMv3eUf6ZYgUQGRU8RAGCRonuYij7LtsvF6qcvZWQlMHsew wK2lDb8CJ0v94kzAbGCktZhs= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 85E5E380460; Sat, 22 Mar 2025 17:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662841; bh=R/4F/wHtxfPkv6MWhaljJS3RA5NEW/fbEX4QiDc4jLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C3IFumRwLgYSDbD5Zu6qIBKXp8Hg77d6OR4UOnpDUtzbtotJhTYihS/ErfZwr39GC gAu5hNa/eAujf1RrqrNISGlTW0bRbpuep7zynQgUKVhNBy9uhtMA63vH+aujh4f7fR J9pKUZApfsNjBP/Hf/5vxZBK1IUsHSD8RM3h1MKows+F7GpO1+sE3Sw3cNVcCf8Z8h V2DCtWBg/NLaY6zFzKhFdU7xwOmrBAyqJ5Sv561RCjxNx5eR0fZx3M31uUQ1PJebWg otitIrZFcRU0xAIuR1QPjMgvMgbsgvLN95n79CkIZd6bi0Zwl2s1V5oKZft0pMBx7C 4FAUnr6V3D6YhwA+7D/Ej6BCQO3XiOoTTolTXAmmq6TfyyOuagAHM/bzREml1EuRBy zqR3F3IAIDluO+k8R8QwBPUea7NLF6YoI059KN32IzZ7ilnjWP3uJUz98g2W2SrR4L 2EBwFmX+yr4SRwMIf9u8Wg5dvS8NN7L34TspNuUiV4v0zLRvxYr1ip6xdfkXGYWalh 5r8CUAnzTTatIiuQtJCF5qSKWBxemmmh05M2RZfT2OMqCNVhmgo7ytWT/l86evaa8A aOV0mhYh757XyQvJHsvjGVsepz1B0o//UStJ3/7uBtnT3GrpZzbOJyfl20iiOskMBv h/JeDLCu7lQJ9DXVk87D9Q7M= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:26 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-rc-file-default-enable): New exported variable. (gitolite-rc-file-compiler)[enable]: Use it. Change-Id: Ie6326ff69f3d454d96db6629dd5387757567d68f --- gnu/services/version-control.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 6ee81eefe4..b3196199e3 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-roles gitolite-rc-file-enable gitolite-rc-file-extra-content + gitolite-rc-file-default-enable gitolite-service-type @@ -243,6 +244,17 @@ (define* (git-http-nginx-location-configuration #:optional ;;; Gitolite ;;; +(define gitolite-rc-file-default-enable + '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")) + (define-record-type* gitolite-rc-file make-gitolite-rc-file gitolite-rc-file? @@ -262,15 +274,7 @@ (define-record-type* (default '(("READERS" . 1) ("WRITERS" . 1)))) (enable gitolite-rc-file-enable - (default '("help" - "desc" - "info" - "perms" - "writable" - "ssh-authkeys" - "git-config" - "daemon" - "gitweb"))) + (default gitolite-rc-file-default-enable)) (extra-content gitolite-rc-extra-content (default ""))) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 09/13] services: gitolite-activation: Convert to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266288425611 (code B ref 77186); Sat, 22 Mar 2025 17:02:05 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:24 +0000 Received: from localhost ([127.0.0.1]:45106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dr-0006ev-QE for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:24 -0400 Received: from wolfsden.cz ([37.205.8.62]:44932) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DE-0006bD-K1 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:46 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9E86338005F; Sat, 22 Mar 2025 17:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662843; bh=mPyf1LBG92FYjvZw1afG21KmDbe8dK9T9gMmEEt7GGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ci22sESLP+S9pwAC+S+dBHluaa6o3Hl0b1Pz0PwViLq6AQS6pRF4WkABDphwzP1jU 346RwLJiCrMcWXRmicp50AWe16kRhun+7L02Ttc4dLcL6m+Sve2sV64icJayfkX4bS SNPk9xYjPp1YlaK0rREIyR1cD0PuhRxWZtxC7huZCh8od3+ttxwzrFmqEe0qdHkeRV kRssMU5e/Q0TMbt7LGoq66pOzC2HGt3iFYR3Q7ppz3Lg3j99q+bEcIjqe0IgmVJwjs 8/lCtqWD/bgoU5T/Z5WQ3YBHDUIS3784X0qdKRNryQFUqSNZeRWO/4x1RnHCmkFUN7 y5dAJuwOXXspNyrUlaE1l1rrGhWdcKu/kqL3ftYOh6+5tF52jQhqtivuDRuuHB7Gkn Z72VMmFSPzrgF7qTmyLr5Ic0gZe6tjCK4MdeESoNs3djS5Agognoqd6EhDPAeOO4EX Q7+i6BdAzNNXqZ9dg5MBd0+PzXJPo9HRbngC5GAAq78fEEzG4b+zv14FjsZbNypvEj +JtQ9C/s6TFoT6rR4/ksGi6ygtbgqcEYdhH9MPA1bH2QDWGZDf7dO7aQefTmwIR02c SzkZLiPHsJ4V0UkWueubE6olGDEQ5MbquYzxjKF6zDWfPV7+/ta4U8c4QbPqQCfgzJ hVwsas1cpLnE2XRecKD2Gb1Q= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 0D61C380C10; Sat, 22 Mar 2025 17:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662843; bh=mPyf1LBG92FYjvZw1afG21KmDbe8dK9T9gMmEEt7GGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ci22sESLP+S9pwAC+S+dBHluaa6o3Hl0b1Pz0PwViLq6AQS6pRF4WkABDphwzP1jU 346RwLJiCrMcWXRmicp50AWe16kRhun+7L02Ttc4dLcL6m+Sve2sV64icJayfkX4bS SNPk9xYjPp1YlaK0rREIyR1cD0PuhRxWZtxC7huZCh8od3+ttxwzrFmqEe0qdHkeRV kRssMU5e/Q0TMbt7LGoq66pOzC2HGt3iFYR3Q7ppz3Lg3j99q+bEcIjqe0IgmVJwjs 8/lCtqWD/bgoU5T/Z5WQ3YBHDUIS3784X0qdKRNryQFUqSNZeRWO/4x1RnHCmkFUN7 y5dAJuwOXXspNyrUlaE1l1rrGhWdcKu/kqL3ftYOh6+5tF52jQhqtivuDRuuHB7Gkn Z72VMmFSPzrgF7qTmyLr5Ic0gZe6tjCK4MdeESoNs3djS5Agognoqd6EhDPAeOO4EX Q7+i6BdAzNNXqZ9dg5MBd0+PzXJPo9HRbngC5GAAq78fEEzG4b+zv14FjsZbNypvEj +JtQ9C/s6TFoT6rR4/ksGi6ygtbgqcEYdhH9MPA1bH2QDWGZDf7dO7aQefTmwIR02c SzkZLiPHsJ4V0UkWueubE6olGDEQ5MbquYzxjKF6zDWfPV7+/ta4U8c4QbPqQCfgzJ hVwsas1cpLnE2XRecKD2Gb1Q= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:29 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-activation): Use match-record instead of match-lambda with $. Change-Id: I37e3018513a8f20eeed8614dff46a63b8d7c2883 --- gnu/services/version-control.scm | 123 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 83391c15d1..67009620b4 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -349,78 +349,77 @@ (define (gitolite-accounts config) (comment "Gitolite user") (home-directory home-directory))))) -(define gitolite-activation - (match-lambda - (($ package user group home - rc-file admin-pubkey) - #~(begin - (use-modules (ice-9 match) - (guix build utils)) +(define (gitolite-activation config) + (match-record config + (package user group home-directory rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) - (let* ((user-info (getpwnam #$user)) - (admin-pubkey #$admin-pubkey) - (pubkey-file (string-append - #$home "/" - (basename - (strip-store-file-name admin-pubkey)))) - (rc-file #$(string-append home "/.gitolite.rc"))) + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home-directory "/" + (basename + (strip-store-file-name admin-pubkey)))) + (rc-file #$(string-append home-directory "/.gitolite.rc"))) - ;; activate-users+groups in (gnu build activation) sets the - ;; permission flags of home directories to #o700 and mentions that - ;; services needing looser permissions should chmod it during - ;; service activation. We also want the git group to be able to - ;; read from the gitolite home directory, so a chmod'ing we will - ;; go! - (chmod #$home #o750) + ;; activate-users+groups in (gnu build activation) sets the + ;; permission flags of home directories to #o700 and mentions that + ;; services needing looser permissions should chmod it during + ;; service activation. We also want the git group to be able to + ;; read from the gitolite home directory, so a chmod'ing we will + ;; go! + (chmod #$home-directory #o750) - (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) - (copy-file #$rc-file rc-file) - ;; ensure gitolite's user can read the configuration - (chown rc-file - (passwd:uid user-info) - (passwd:gid user-info)) + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file rc-file) + ;; ensure gitolite's user can read the configuration + (chown rc-file + (passwd:uid user-info) + (passwd:gid user-info)) - ;; The key must be writable, so copy it from the store - (copy-file admin-pubkey pubkey-file) + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) - (chmod pubkey-file #o500) - (chown pubkey-file - (passwd:uid user-info) - (passwd:gid user-info)) + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) - ;; Set the git configuration, to avoid gitolite trying to use - ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home "/.gitconfig") - (lambda () - (display "[user] + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home-directory "/.gitconfig") + (lambda () + (display "[user] name = GNU Guix email = guix@localhost "))) - ;; Run Gitolite setup, as this updates the hooks and include the - ;; admin pubkey if specified. The admin pubkey is required for - ;; initial setup, and will replace the previous key if run after - ;; initial setup - (match (primitive-fork) - (0 - ;; Exit with a non-zero status code if an exception is thrown. - (dynamic-wind - (const #t) - (lambda () - (setenv "HOME" (passwd:dir user-info)) - (setenv "USER" #$user) - (setgid (passwd:gid user-info)) - (setuid (passwd:uid user-info)) - (primitive-exit - (system* #$(file-append package "/bin/gitolite") - "setup" - "-m" "gitolite setup by GNU Guix" - "-pk" pubkey-file))) - (lambda () - (primitive-exit 1)))) - (pid (waitpid pid))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) - (when (file-exists? pubkey-file) - (delete-file pubkey-file))))))) + (when (file-exists? pubkey-file) + (delete-file pubkey-file)))))) (define gitolite-service-type (service-type -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 10/13] services: Add gitolite-git-configuration. 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: Sat, 22 Mar 2025 17:02: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.174266288525618 (code B ref 77186); Sat, 22 Mar 2025 17:02:05 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:25 +0000 Received: from localhost ([127.0.0.1]:45108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Ds-0006f1-AR for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:24 -0400 Received: from wolfsden.cz ([37.205.8.62]:58364) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DF-0006bS-HZ for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:46 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8C57C380499; Sat, 22 Mar 2025 17:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662844; bh=e8TxQKZER5tX3gME0OMxfIEAzgMPZDphzZNxbGiXfTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CXR60rNCT+IzFnv9sYVYWYzbyGTbj0qN8lCK+J8pn+wBznhb5T3Wi9R5R5JNOTtm8 2KxZRROBB0UEdEvjSIBqi0GjvRTYDdts7aTz6mHteztiXEKDRZGMvf7caGdrO1GtI5 gnNGxIycn/rOylFJANHAZB7HePCdaj78jg+Fv4mKHzsjcFzb0OKz75cVHn3xP2Qygd 4XLzenQ6nUjh9y6V9Ft6eO+nFzTFFLpojFWy0jbzCtJ+hvJoK6ZIch7fglLbDstaf9 +LPQ/QbZq1eLlIBQota7Hr+lyuK1yTadft981HFoXcajb3JR+tO5C1HuAiFCggnj5j 8r3Nk/Wc5sWGn4AnFFoyvRs4+yd9JJQICH3MYRM8AehihKKFE2eC1soxu03tRySaZC C4vPA88+zltSb0UK2dYv7Nidq87W7pOQx+HTjg/9g49kBPAT1WzlcKks/hN9X9ysjK 0tPNxVna/M2sV8kG2ij07XrFDpbAyMIQV4z51ipL1Qy5ZiOtmczZ0QUrNzyjju+rIr 7VqrsE5NfMJcVryEYn32+OQUBIUw27GgntmbmelsDFx6R6kuBg6KVvVd4rJDw9krl6 4tLsjasozkphZRKheV4I+lTosk2CW7Ti/NTV76bGMD5UNo4qgrJjUB0YHPXEaA76vR GyFrmYz8HeD6oE2P+5z5kRgI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8F2D5380C82; Sat, 22 Mar 2025 17:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662843; bh=e8TxQKZER5tX3gME0OMxfIEAzgMPZDphzZNxbGiXfTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HJBERhQJTnn78RomuUTZqL+m2NUC3qEc8dpuBNfxN38Lgibdge4vXuHNtgWa0y21S DCCqMZV5w4vfe0L4UqhVrooJspagKo9SvoGxf0OxqRju+RLYLSKLkQrZOmfXz+Sznp zrh0TgxEoaZYiJWqOCFdJdIWOwlpgoDj6devbCzMHUwJ/zuavTdriOuYC38YkYVjY0 T9fo6t+h8zp/qrPcgtbleVfZPI1ZkmmKTiqTUE/rZFnaa+npDTrMGCpN4M9TdzxFDu n5KkvhVSzYWSZYn3Meb5Spn3Q4TfAxMR1TEGCzmf4Yfo5mzwJ20ro7lAQP35oRPkmB w3nzRkHl9mWT//5V4kCaC8NZKTnvXUIDisHkQ7KKtt4122Gf+IEcfXT7d02RvmkwDd /OwzRnjgBmiymzze5VO4sq1a6WoW3EbK+6N+ainSjIdYqVyjxO7QVwM14lWsCtdQ7P rIFMU2eHlyhRxpwH6tSoeKhXOI4I4Fh8lL/RMZ69ZI/GP9U0lWF251B2knDCKFPXEs 3VbGiIWQS7Jz5V+mAvGmgzUqZ5dmpahU17gVdnPM58NKIvugybRhR2p5PjfoG4sTsE HraVTaPV/TgeCXJOyWWMbDZ11bScJ3yTek5LVcgyi9GvKwObsPNG//4wpy2ap3D/OW Sb749lCSnwmBP0gJ/9ZDvBzQ= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:30 +0100 Message-ID: <2de343c2499bf0297cf03c58226670b02710d9ad.1742661305.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) In preparation for further customizability of the git configuration, extract the current setup into a separate record type. * gnu/services/version-control.scm (): New record type. (gitolite-git-configuration-compiler): And gexp compiler for it. (): Add git-config field. (gitolite-activation): Use it. * doc/guix.texi (Version Control Services): Document both. Change-Id: I7658698a93f938f62f41a4fa45b72de1eeb14414 --- doc/guix.texi | 17 +++++++++++++++ gnu/services/version-control.scm | 37 ++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e60fef9673..e584b072e1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41095,6 +41095,10 @@ Version Control Services A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite. +@item @code{git-config} (default: @code{(gitolite-git-configuration)}) +A ``file-like'' object (@pxref{G-Expressions, file-like objects}), +representing the git configuration for Gitolite. + @item @code{admin-pubkey} (default: @code{#f}) A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite. This will be inserted in to the @file{keydir} directory @@ -41170,6 +41174,19 @@ Version Control Services @end table @end deftp +@deftp {Data Type} gitolite-git-configuration +Data type representing the git configuration file for gitolite. + +@table @asis +@item @code{name} (default: @code{"GNU GNU"}) +User name used for commits (e.g. during setting up the admin +repository). + +@item @code{email} (default: @code{"guix@@localhost"}) +Email used for commits (e.g. during setting up the admin repository). + +@end table +@end deftp @subsubheading Gitile Service diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 67009620b4..68297dee19 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -66,6 +66,12 @@ (define-module (gnu services version-control) gitolite-rc-file-extra-content gitolite-rc-file-default-enable + + gitolite-git-configuration + gitolite-git-configuration? + gitolite-git-configuration-name + gitolite-git-configuration-email + gitolite-service-type gitile-configuration @@ -320,6 +326,23 @@ (define-gexp-compiler (gitolite-rc-file-compiler "# End:\n" "# vim: set syn=perl:\n")))) +(define-record-type* + gitolite-git-configuration make-gitolite-git-configuration + gitolite-git-configuration? + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost"))) + +(define-gexp-compiler (gitolite-git-configuration-compiler + (config ) system target) + (match-record config + (name email) + (apply text-file* "gitconfig" + `("[user]\n" + "name = " ,name "\n" + "email = " ,email "\n")))) + (define-record-type* gitolite-configuration make-gitolite-configuration gitolite-configuration? @@ -333,6 +356,8 @@ (define-record-type* (default "/var/lib/gitolite")) (rc-file gitolite-configuration-rc-file (default (gitolite-rc-file))) + (git-config gitolite-configuration-git-config + (default (gitolite-git-configuration))) (admin-pubkey gitolite-configuration-admin-pubkey)) (define (gitolite-accounts config) @@ -351,7 +376,8 @@ (define (gitolite-accounts config) (define (gitolite-activation config) (match-record config - (package user group home-directory rc-file admin-pubkey) + ( package user group home-directory rc-file admin-pubkey + git-config) #~(begin (use-modules (ice-9 match) (guix build utils)) @@ -389,12 +415,9 @@ (define (gitolite-activation config) ;; Set the git configuration, to avoid gitolite trying to use ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home-directory "/.gitconfig") - (lambda () - (display "[user] - name = GNU Guix - email = guix@localhost -"))) + (copy-file #$git-config + #$(string-append home-directory "/.gitconfig")) + ;; Run Gitolite setup, as this updates the hooks and include the ;; admin pubkey if specified. The admin pubkey is required for ;; initial setup, and will replace the previous key if run after -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 11/13] services: gitolite-git-configuration: Add default-branch 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: Sat, 22 Mar 2025 17:02:06 +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.174266288525625 (code B ref 77186); Sat, 22 Mar 2025 17:02:06 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:25 +0000 Received: from localhost ([127.0.0.1]:45110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Ds-0006fA-Rd for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:58366) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DF-0006bX-LJ for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:47 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9B7F3380461; Sat, 22 Mar 2025 17:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662844; bh=Jyz1bp39PgWoe4PDajzmP6HO2GwDyT4yEThG3v8q/Hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ig3iis1j3kHYOH54apdVSL1CfRDDk65UHWtsNFH0qFje30M0OIjMSV9fKsCA0C90V BDNhBAbrB0QX3KsnLSky9TErsHM09X9/1/1gpLaOpOA3vcc3isTXJe5hmtmYHD6yBN xwgVijnktY70AhO9DCnbxSK8Y9rZutPO8+Eyi5VgN1wB/x6zYoW5szc2PgfoHobSb/ UmksjGSnB0OrMVHWAtki+Dz7f8Bwvh9EGs3og32dn29idd/QjOVtVxHHj82bj1oh/A oZO9w7WJsnhyHbW5UQcA4eNcbqRPGF2G65jZr+67CkxT8x3cat+amnJpveDB2e6hfu ltYQ8OJdXPlSkfR2aENfNic6Q/69aDdxXaVIGlSt9Z42dvXFCQKxvU+Z0UKMNoHPfb TW79I4N32SPtJmHqTXcqHXKldAnBgb0s0AVojYOJC0iGaCdr9kbD1IYIdi7URDT+vc erL8tLmG7AhFElxjaZdBCwh1jAHDf97gjs98sn3MOQiSH2zNMRlfQmc/eGUOhCyKSv ZVxbTidNDgRRDwNWtpAVIGJs2la7OSs66kC2CcSg/U30CXlHeL1i9P9lLsmh1SjqDt ASW9UNRBcnE67xIcmFmvcgVcVJPL8BozibeMOjTrfK0PXdBiBs7rMND5Y22DkQHZXb 5rfgWGTHXge5oVAZw3T7Rd60= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1C32D380C83; Sat, 22 Mar 2025 17:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662844; bh=Jyz1bp39PgWoe4PDajzmP6HO2GwDyT4yEThG3v8q/Hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ig3iis1j3kHYOH54apdVSL1CfRDDk65UHWtsNFH0qFje30M0OIjMSV9fKsCA0C90V BDNhBAbrB0QX3KsnLSky9TErsHM09X9/1/1gpLaOpOA3vcc3isTXJe5hmtmYHD6yBN xwgVijnktY70AhO9DCnbxSK8Y9rZutPO8+Eyi5VgN1wB/x6zYoW5szc2PgfoHobSb/ UmksjGSnB0OrMVHWAtki+Dz7f8Bwvh9EGs3og32dn29idd/QjOVtVxHHj82bj1oh/A oZO9w7WJsnhyHbW5UQcA4eNcbqRPGF2G65jZr+67CkxT8x3cat+amnJpveDB2e6hfu ltYQ8OJdXPlSkfR2aENfNic6Q/69aDdxXaVIGlSt9Z42dvXFCQKxvU+Z0UKMNoHPfb TW79I4N32SPtJmHqTXcqHXKldAnBgb0s0AVojYOJC0iGaCdr9kbD1IYIdi7URDT+vc erL8tLmG7AhFElxjaZdBCwh1jAHDf97gjs98sn3MOQiSH2zNMRlfQmc/eGUOhCyKSv ZVxbTidNDgRRDwNWtpAVIGJs2la7OSs66kC2CcSg/U30CXlHeL1i9P9lLsmh1SjqDt ASW9UNRBcnE67xIcmFmvcgVcVJPL8BozibeMOjTrfK0PXdBiBs7rMND5Y22DkQHZXb 5rfgWGTHXge5oVAZw3T7Rd60= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:31 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add default-branch field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 4 ++++ gnu/services/version-control.scm | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e584b072e1..3332813a02 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41185,6 +41185,10 @@ Version Control Services @item @code{email} (default: @code{"guix@@localhost"}) Email used for commits (e.g. during setting up the admin repository). +@item @code{default-branch} (default: @code{#f}) +If true, set the @code{init.defaultBranch} option to that value. Common +values are @code{"master"} and @code{"main"}. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 68297dee19..712f0b1756 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -71,6 +71,7 @@ (define-module (gnu services version-control) gitolite-git-configuration? gitolite-git-configuration-name gitolite-git-configuration-email + gitolite-git-configuration-default-branch gitolite-service-type @@ -329,19 +330,25 @@ (define-gexp-compiler (gitolite-rc-file-compiler (define-record-type* gitolite-git-configuration make-gitolite-git-configuration gitolite-git-configuration? - (name gitolite-git-configuration-name - (default "GNU Guix")) - (email gitolite-git-configuration-email - (default "guix@localhost"))) + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost")) + (default-branch gitolite-git-configuration-default-branch + (default #f))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email) + (name email default-branch) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" - "email = " ,email "\n")))) + "email = " ,email "\n" + ,@(if default-branch + `("[init]\n" + "defaultBranch = " ,default-branch "\n") + '()))))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 12/13] services: gitolite-git-configuration: Add receive-fsck-objects 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: Sat, 22 Mar 2025 17:02:06 +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.174266288525633 (code B ref 77186); Sat, 22 Mar 2025 17:02:06 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:25 +0000 Received: from localhost ([127.0.0.1]:45112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dt-0006fG-8J for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:58368) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DH-0006bd-3L for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:48 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 16C6F37F478; Sat, 22 Mar 2025 17:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662845; bh=aFOBzXfJBbSOcnBzy5LkChYMe/Py+BaFgFMIU3X01uI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Hu/L4aiDrYmWKHjxGoVWSRolXeOze4X4GVEUe0REZ2WTiMyXJfd4wqd4SsRG099bl 8CRKZSVsg0eoPo2a/6MfLRKoz8q7bANkiHWsRyxdfZrJaB91NXA5ZZ7dVnORRPW2ib NX7/iXAxOEMjkqc6fn6bIlxy3Qk0jJtN4ny4gwj3zK4Tm+qBSAiNAcdeFtgJ43NwQt TDQq6+qiGK68plSEUeB0lxopXsmotXJTt6mjr5USnVlPLfVCfeHiW+2H0jo2aiTS1G dZbagkidKXXVLUuzNpA5TFj8pVkV0EhqnF+NIy/i0KWLRFrO6AJezNUKvdEhDIB/Jm nE7yAx/nkzz6+iuXVfyCgtWRD50tSof+brkmM3trwuRzQ0MDh9eYxYZR214wdI+4al dXYDoBKMEZoKyELWSncc0BtzfTnsMVYAfjVTiNY8jt9i4PreBWzF98U8w/0Wkmf3aq eaTlXnrXiZRXVz516DRjmbG766QiiEijm5Xd8KaeFFLFV1Egb2wMTjMgzKJV6CVze+ 9GE6Y8Gi4bSKH07el/l32xyriUz6w8v8UAP3tZms2MuvKfALLJKgYdl0G9D+iP+ry+ M7NFWJS86Oqq5Df4YN2p9BwPs9mnqGS6EZCr+kVqVWJ8BgZdlb+ZPNSwojddEzE8xY ccadAFdjgB+P7Tkb1fZ+Vkbg= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 9EE6737F9DA; Sat, 22 Mar 2025 17:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662844; bh=aFOBzXfJBbSOcnBzy5LkChYMe/Py+BaFgFMIU3X01uI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vaOzAVAGL5ai4idOWAwZtGuRJPzoJSy/FEc+dsohbQ6ELsEBBS5XUxRJ3kDuKU+6r U9qqg5NlXVHwsVjHpk1nL8g86fxmLMmUP+AkMddGtY18yO6fdKr5Vxb3ccB4dE0RGH iAvzX1IbdzHBS2pSg2g2qpUcsTf6W7H5UxcwVGuz4dgYgX6qjtS3BxMdMCQe9rwSDL R3ZLbISL44BoPQpsQYwbavik3iojSpFJHkFRVE2Vj4oWcSDBKfXbtfiJSokHY4e/I1 2WGD6KAdZjQ1DuVEl3nu+tt0CUj2jqnJxxnBRPSrhoyLIU2jnAvT6zq+7irCro2jhe bxqGV6McNt5ykyqrfnCFxnBmaSejv/991VwxxEoIekoy/h/ne5oJchyAsfT2UeKs2t 1sXNQ7znF2K0EztrmqqIAw4LPc2nFnTmeGc//BQJZLBwknotHHyC75/6vFGIkSXPQW WPDv4JW7FMAOf0X0tnlsmDNP/AOGUMXYSgJ4rI6SiJXNoiMKpGUfTkroo+l+iZHS3w PexHEuk9B+zo+LYIM6CRcm3kkW5QGSYSHH5g1BFbm1KY611ajteYqQKk/abjEwi2Ij V9mQrt8sqEiiuGqCNRRCx2rzfefzGhvsjTogdcPQ4OK4UOXXES7heD1fxq+3S8mF+0 g3ttK2Yby0w/VUiTf0WThsQo= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:32 +0100 Message-ID: <1d370fb258e2a07c98ce83cf3df57a0d29cd997a.1742661306.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add receive-fsck-objects field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3332813a02..f8fa1ab3bd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41189,6 +41189,9 @@ Version Control Services If true, set the @code{init.defaultBranch} option to that value. Common values are @code{"master"} and @code{"main"}. +@item @code{receive-fsck-objects} (default: @code{#f}) +If it is set to true, git-receive-pack will check all received objects. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 712f0b1756..4f36495740 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -72,6 +72,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-name gitolite-git-configuration-email gitolite-git-configuration-default-branch + gitolite-git-configuration-receive-fsck-objects gitolite-service-type @@ -330,17 +331,19 @@ (define-gexp-compiler (gitolite-rc-file-compiler (define-record-type* gitolite-git-configuration make-gitolite-git-configuration gitolite-git-configuration? - (name gitolite-git-configuration-name - (default "GNU Guix")) - (email gitolite-git-configuration-email - (default "guix@localhost")) - (default-branch gitolite-git-configuration-default-branch - (default #f))) + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost")) + (default-branch gitolite-git-configuration-default-branch + (default #f)) + (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects + (default #f))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch) + (name email default-branch receive-fsck-objects) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -348,6 +351,10 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if default-branch `("[init]\n" "defaultBranch = " ,default-branch "\n") + '()) + ,@(if receive-fsck-objects + `("[receive]\n" + "fsckObjects = true\n") '()))))) (define-record-type* -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 13/13] services: gitolite-git-configuration: 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: Sat, 22 Mar 2025 17:02:07 +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.174266288625639 (code B ref 77186); Sat, 22 Mar 2025 17:02:07 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:26 +0000 Received: from localhost ([127.0.0.1]:45114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dt-0006fO-M3 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:26 -0400 Received: from wolfsden.cz ([37.205.8.62]:58380) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DI-0006bv-5a for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:49 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 3174A3802FD; Sat, 22 Mar 2025 17:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662846; bh=RZ9wAiwBT82wj7XoQa/Zy/16wJkPaFotZ358UBIdToY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AalJbCNFyjkA4qvGr8tDsgWOUusQilv/C/vThketooVoCSZ+tJLZ23JJXI+Ntl9L1 ypnnf6ixRuIbIzS1WasS1U5K10RygXP6AebqDsq2P0AQv2w6cC6fVV1ap+lrhQNVtG ntzoJneZf4hFNNwG1GZXpCrmyi8CIX6be6ZEJHow0V9PKfwiJCbkKuSrAZT8qGsZvj IhKryK0aHt2h3b5pTrd9HYGogYAq3rWj5kqIe9NVW+jQzBByk5Pu1tpiw2UBIP3oQi DZbB9RkEx2d/oBgO1zHICVAKmTJ7ajUmFRxjuZMi7qU/M8dBa0r+cUqJnvMXr7DyB+ 9Vr/gzT/yA8PHuVNUuhZTYXFJ3/G/97YDrIYuHT6g9PtKDEKRKbpAE2djKYYSziZhM T+9/HDGbhtRiJ3JJbfLVDoDEuq2M1G02lG/TltPZrwfaAPzaoDUa0aUvyPJKI35ata uyKlFj8np3J05aGe3TRL4PbcnjPsrUMSwDpOQ8YbFtOIFYE82X99ZyVTUbSdD2g3Qp XBbEbV306E+dXSJaDew9spf8kkC2QvkSqA2Zjshv96uv9JZnM/1tvgCplGzvTj4Nn1 Q2dRf3YD7C7TD6GWfui3IglxAn6mYI3J2th2sxKMcyaXysWC1mTZZDvdXumwJXoUyO fb2yiTzig8Gkc3hw/+LhhJNc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 2CBE037FEE0; Sat, 22 Mar 2025 17:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662845; bh=RZ9wAiwBT82wj7XoQa/Zy/16wJkPaFotZ358UBIdToY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NLc50yVKjb/RggKlCeKaRwwhAD0y4SMOrBHPKl7Ol8N/lSX19Ji2iuMMJl20LonGq UoR8FXX2asycRfYpvbeKhuLxSqc9mfq/iUCLVWESa83cfTdjb65CcDN6x9zE7tIQ1b pvMu1H/qUMEIdgUOLOaeUCFY2JcP+gEHeak7KnZVZpFQwj9OZ/2YVVbNOkelodtnXj XgbQ2sEw4nHcVLoXn0WuaENdxEgxU36IlMw8TD3R4vdeEuYWko33tMPQLLHi5SFlvc 7VNQ6SHWi9J/8IJJ8dEgwXlDP+tc91brpVVkj8a1ob2ckY5ZtOozCSOJZSJBdQgSPK aZzr+3r+UqBqlCjedltL89gD3VjPxmGmas55djnl68GGbkVGRXWDPj37Xs+KnONHpt 11Wx41MkFAQQzFPXmaRvUYPeq9jrwPMEIf/C1W3tIdMOfut+mswlpetKrDqd2AndUs ru/X6+k76BkmTnDfTQPSvH2r48VkftMEk6uGpba/ZOb/8NyKu/kQVebptojUlGObf0 4uFvQ2/5hIVRnPt50KC7fdVevrXFUUNooa6BxfiOuVh79WiFbFTR2sfDj0/UMbWDvm hYdxoml7r6IVPu6UMYQFV9utyTsY9AuL5Q4hud4X50pguEigm2YvW1kS33OVcMqi2Q wOzIerJTzETanjlccI/77cDI= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:33 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add extra-content field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f8fa1ab3bd..311564c1d2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41192,6 +41192,9 @@ Version Control Services @item @code{receive-fsck-objects} (default: @code{#f}) If it is set to true, git-receive-pack will check all received objects. +@item @code{extra-content} (default: @code{""}) +Extra content to add verbatim into the git configuration file. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 4f36495740..05a3530fa1 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -73,6 +73,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-email gitolite-git-configuration-default-branch gitolite-git-configuration-receive-fsck-objects + gitolite-git-configuration-extra-content gitolite-service-type @@ -338,12 +339,14 @@ (define-record-type* (default-branch gitolite-git-configuration-default-branch (default #f)) (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects - (default #f))) + (default #f)) + (extra-content gitolite-git-configuration-extra-content + (default ""))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch receive-fsck-objects) + (name email default-branch receive-fsck-objects extra-content) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -355,7 +358,8 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if receive-fsck-objects `("[receive]\n" "fsckObjects = true\n") - '()))))) + '()) + ,extra-content "\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 01/13] services: gitolite-rc-file-compiler: Switch to match-record. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11:02 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266340727337 (code B ref 77186); Sat, 22 Mar 2025 17:11:02 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:07 +0000 Received: from localhost ([127.0.0.1]:45215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2MG-00075t-BX for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:06 -0400 Received: from wolfsden.cz ([37.205.8.62]:57536) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MC-00074b-0o for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:01 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 0D4A937F2F9; Sat, 22 Mar 2025 17:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663399; bh=JOqwnKhey/JQlOXRCay3KOdq9ZA4mBH+YYW/7tZ2dck=; h=From:To:Cc:Subject:Date; b=cMVU+HRWOxEomkx6K0k7JWECGpLjJCjaP46/GDQ8stL0jCOH547ZQqwBMvvKDgX9c wH6JzrFFIu5h/Zb/p6Gt8pd92WnTmvuW/6wwpfPVsPXIIfKvWNc88qv7Ms/VZut8JF JOxwrklSA2P5963WntQBcxKAdRJIpJ2j5L/LDWJcr4n9RMNHwJrECNYBpMEyzGx3ug oAUN6nJpz/8IeiatJ62apq3QxT1EqNTxJam1IIIhn5Dk6J0g751YwEgIymKAtyXpRw Qm7U3aBFhhNer2BFZQ2G6KwC0n3gDm4oWWRzE5d7HTsYBuOy4rce1pyUSg5dQESI9L 7pEoNJNpZKNTwRiCc54zcVWmgMBk1P3lBh1fTTcALw2HAHKoxWNY/z4e/WoQOEQajx KpcBdfPspxHtEsVT3ANmwtKW0ma/UMIezrtTxE2LvVRyZmnzI1Lw7tnMKw8M5wkjFj 4YmTfh7g3yykfRYkUjRxUe5lFKgG/+LmzMCnYyZArqyYg2OplrgL55xF9uI3qcl7CE fS9iQVzB2o2CZfObfa0yROb79GB195VfBhO8eO2BdpfiHZvLgItd/hC49gbllTFxs+ ZtYEgpXScuDcL8+OwDLfPM1K1dLkg+qtDTvpFnpancsUe1FCwBLQh95TSldfPQ41cb xR2/G6IO9Lbp8/iuxfJuR8G8= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8793337F175; Sat, 22 Mar 2025 17:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663397; bh=JOqwnKhey/JQlOXRCay3KOdq9ZA4mBH+YYW/7tZ2dck=; h=From:To:Cc:Subject:Date; b=XSVddLlmvjoZjn188Ow/99QSdtMr6iS18swmDF3yH4f7gILsXLGGU0693fJv7PKz0 hsaa9o08hXachnCVy9vzkEUtjHrLCZdp202TIHm3/av9CwklNi7P7XvmnEBWOZl2AB nw79HJAATZx/j4gw/x0yOThTb6l8wKeqHZHnAmRQeQVc4sDqbzfL4lWTCWbaR02deH XDbFHUtFeDBV+0Wdzcq0nNShBHKoob5QswwqC3cfv2T1GIwItmq+hlGjAKK4VlPrak vFX6lfBSIRbHcfC9BcEVTuR2N5hPCtc8lFLvZSK3sICp2tiPaWWx9qFkEcPfmX9ift zsR4ScFqEj66yWrDN/+OcgG3yDmpTKr2POtLyhl0YbEKRpw3oxvrJ2tnhHuj4BlWU7 fOGvn8ArmNV+Cm0dh6x5Jziga94S25ItwfJyb8UrLcSgB+DuND1dqT0yPCbZrEogih FgTdS/2XXCBtiVPvIOU2857//wJ0R9R/GeK4hY7Jhb3/HUvpFTII+ar4nUTw726doF 4Gc0AZtCuBahQ9m8LmJY5irRQZQ8gWCXwhr1VlPsyYVgGqPCh9EzQRfZfO2jZF4YHw WKi/jlmHdG4YIxwLTJ+1wJ9kBhBgL61tWNiINWc3dBWcKc0bOnZ1Z+R4V8atiAHbxT 9h2O/DgVoAwzNFps/BbPCikI= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:02 +0100 Message-ID: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-rc-file-compiler): Use match-record instead of match with $. Change-Id: Ia2f4985e921aee5f8859d1858f7c186b707d7a36 --- v2: Add copyright. gnu/services/version-control.scm | 55 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 06b6ff224d..f5558e9197 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -267,33 +268,33 @@ (define-record-type* (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) - (match file - (($ umask local-code unsafe-pattern git-config-keys roles enable) - (apply text-file* "gitolite.rc" - `("%RC = (\n" - " UMASK => " ,(format #f "~4,'0o" umask) ",\n" - " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" - ,(if local-code - (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) - "") - " ROLES => {\n" - ,@(map (match-lambda - ((role . value) - (simple-format #f " ~A => ~A,\n" role value))) - roles) - " },\n" - "\n" - " ENABLE => [\n" - ,@(map (lambda (value) - (simple-format #f " '~A',\n" value)) - enable) - " ],\n" - ");\n" - "\n" - ,(if unsafe-pattern - (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") - "") - "1;\n"))))) + (match-record file + (umask local-code unsafe-pattern git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + ,(if local-code + (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) + "") + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + ,(if unsafe-pattern + (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") + "") + "1;\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 02/13] 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: Sat, 22 Mar 2025 17:11:02 +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.174266341027438 (code B ref 77186); Sat, 22 Mar 2025 17:11:02 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:10 +0000 Received: from localhost ([127.0.0.1]:45226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2MJ-00076r-0q for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:09 -0400 Received: from wolfsden.cz ([37.205.8.62]:57522) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MB-00074Z-PL for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:01 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 73F5737FB4C; Sat, 22 Mar 2025 17:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663398; bh=uvHBnszqcHNWSmGWaoUPTxI6k0AAWdw+AsQhP6tWlao=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UfSQqFzRHHGxBfSLDioFQmuYX0FJqS0gEzg98vHedn5CajjE6roCzVWNh4V7LviWg WFPd/KjdkX4U7E49qJy6WqEOjRXlqrFALgjtrRenKF5LD6wknpW0sdsWf0ZVyFUoHA MfGf3p+apTlT7V8j+LmOJ0fCc++9h6dprhopwceDrxAiTnxbzTn8IQo1QAHlJ5HAaW bsRgA5+ytE0nd0Guq2+x5tA34ZkTw1yGPcoWyGMBms2sYwXbxJSmxZd0s4EKdmIP6G KOx8K3uLe7x5GXvFC5b9oc/kr+l4o8iOF//J6W4z1WLDhm9GsTkvFLecVKjleUZXOo 74t/GbrFAjxAsGol/XM/g1tyrUdvnVhKdOoYaUhmT6sniAdzSKe0b75hTiNlpWPYVY vooweWBHhzqet0DNGJKJ9iyLLE5ObFjdfG0dFqhyqLE4cl9Ezx3EOfmng92odIbMmz RcfVJrESGRQwGRKwtzydhi+ow98ddmzdtIPv+2Tb3b5bkEc4Ol9qmPTLrl/teKQhMo AjJ5VIzbpOiGsGfGIs9n2bzMexnXOs5y5r6GzEMl1kFl1iDghwtclLmzHdqYX34vlk QDgsCS5ov32aCtBITLV07NTxb00UhSche1wDjLX4tI1oFTzl3syUwxYYgx2Mrbr09s 4weV/T2QndOF7Eccfh5z1RFU= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1049937EDE3; Sat, 22 Mar 2025 17:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663398; bh=uvHBnszqcHNWSmGWaoUPTxI6k0AAWdw+AsQhP6tWlao=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UfSQqFzRHHGxBfSLDioFQmuYX0FJqS0gEzg98vHedn5CajjE6roCzVWNh4V7LviWg WFPd/KjdkX4U7E49qJy6WqEOjRXlqrFALgjtrRenKF5LD6wknpW0sdsWf0ZVyFUoHA MfGf3p+apTlT7V8j+LmOJ0fCc++9h6dprhopwceDrxAiTnxbzTn8IQo1QAHlJ5HAaW bsRgA5+ytE0nd0Guq2+x5tA34ZkTw1yGPcoWyGMBms2sYwXbxJSmxZd0s4EKdmIP6G KOx8K3uLe7x5GXvFC5b9oc/kr+l4o8iOF//J6W4z1WLDhm9GsTkvFLecVKjleUZXOo 74t/GbrFAjxAsGol/XM/g1tyrUdvnVhKdOoYaUhmT6sniAdzSKe0b75hTiNlpWPYVY vooweWBHhzqet0DNGJKJ9iyLLE5ObFjdfG0dFqhyqLE4cl9Ezx3EOfmng92odIbMmz RcfVJrESGRQwGRKwtzydhi+ow98ddmzdtIPv+2Tb3b5bkEc4Ol9qmPTLrl/teKQhMo AjJ5VIzbpOiGsGfGIs9n2bzMexnXOs5y5r6GzEMl1kFl1iDghwtclLmzHdqYX34vlk QDgsCS5ov32aCtBITLV07NTxb00UhSche1wDjLX4tI1oFTzl3syUwxYYgx2Mrbr09s 4weV/T2QndOF7Eccfh5z1RFU= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:03 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 bcb1f9d9cf..3179d33cb3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41147,6 +41147,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) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 05/13] services: gitolite-rc-file-compiler: Set mode of the generated file. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266341127487 (code B ref 77186); Sat, 22 Mar 2025 17:11:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:11 +0000 Received: from localhost ([127.0.0.1]:45231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2ML-00078T-DB for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:10 -0400 Received: from wolfsden.cz ([37.205.8.62]:57556) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MC-00074g-VF for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:02 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id E346637F178; Sat, 22 Mar 2025 17:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663399; bh=UEBwJuOZurZifmXpN0q9UI+ZS7JQCNxgo7kg5deLIos=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=on6rf1M3PB3eN0vuAKzk/Mw9u0Xt3n1wKzEPgJeLLG7xdd7T8SWgpZ3yTSbjyKO8b MMKL5gxYl0In3pMMBu7RHPTb+rPBAgYFyK7csa2h3n+hX/9qjCvkQ2oruSJt8A575Z g7bpe9UndhEJaIHFhAHDXKzSS+173xTsEOkHxjpZWwBuNY61/X8xLDfgm1Lti5SQMy PvCPYI2vS9B1UQqT8gb6+xXW3ZpieRuE+f3TwtiHUfuvONtCpNYIb6ug1UB5n09qNv 2/ki1HiYj0B7z52zlWF5LfyU3QZKLOmg7HiDBjME8ll3bGG7rKHcqn8SrHcaL4hD8H p2HwbJ2HQ89RUY1wk+1tLqbvhPh+A7WfwvU4i6zNl3Pzw9zZyR3XO8Grjpm3Qs9m+5 mmQiB+nW6CJqQqCdD9oO7UAAhM140TL3JICDcmZ9KQEeZX4qO/cQOJVKF4RoOuTob0 oZJGq6KDKmHmfOj6YrsWUUXqwHsxASW8wX9OOCKHuEKBMji/Y4czp2Ew4W4KIcIftr h1+WPXMdOXpGhCiolgoI/vuwjREy3aR4yVF6km3bvSXx4lDi41ChUuFGg3xw4Ybo/A wo3y2lD48kC8jx0jjIErjiMf5/aKer3mW+VvA5vMV+5D92CgA+X1jMiSM/EYDqgMg3 8hN73eIal55+Hgl1dZGNH3KE= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 9491E37E8EC; Sat, 22 Mar 2025 17:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663399; bh=UEBwJuOZurZifmXpN0q9UI+ZS7JQCNxgo7kg5deLIos=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=on6rf1M3PB3eN0vuAKzk/Mw9u0Xt3n1wKzEPgJeLLG7xdd7T8SWgpZ3yTSbjyKO8b MMKL5gxYl0In3pMMBu7RHPTb+rPBAgYFyK7csa2h3n+hX/9qjCvkQ2oruSJt8A575Z g7bpe9UndhEJaIHFhAHDXKzSS+173xTsEOkHxjpZWwBuNY61/X8xLDfgm1Lti5SQMy PvCPYI2vS9B1UQqT8gb6+xXW3ZpieRuE+f3TwtiHUfuvONtCpNYIb6ug1UB5n09qNv 2/ki1HiYj0B7z52zlWF5LfyU3QZKLOmg7HiDBjME8ll3bGG7rKHcqn8SrHcaL4hD8H p2HwbJ2HQ89RUY1wk+1tLqbvhPh+A7WfwvU4i6zNl3Pzw9zZyR3XO8Grjpm3Qs9m+5 mmQiB+nW6CJqQqCdD9oO7UAAhM140TL3JICDcmZ9KQEeZX4qO/cQOJVKF4RoOuTob0 oZJGq6KDKmHmfOj6YrsWUUXqwHsxASW8wX9OOCKHuEKBMji/Y4czp2Ew4W4KIcIftr h1+WPXMdOXpGhCiolgoI/vuwjREy3aR4yVF6km3bvSXx4lDi41ChUuFGg3xw4Ybo/A wo3y2lD48kC8jx0jjIErjiMf5/aKer3mW+VvA5vMV+5D92CgA+X1jMiSM/EYDqgMg3 8hN73eIal55+Hgl1dZGNH3KE= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:06 +0100 Message-ID: <348dd145213047baef23ef6866924de32a7078ee.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) Copied over from the official configuration file, this sets a correct major mode when you visit the generated file. * gnu/services/version-control.scm (gitolite-rc-file-compiler): Add local variables. Change-Id: I8a9d794a1e3c7049ae606165cf939d81b5dbdf6e --- gnu/services/version-control.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 9bd17334fe..b93cb9f590 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -311,7 +311,11 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if unsafe-pattern (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") "") - "1;\n")))) + "1;\n" + "# Local variables:\n" + "# mode: perl\n" + "# End:\n" + "# vim: set syn=perl:\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 03/13] services: gitolite-rc-file: Add host-name 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: Sat, 22 Mar 2025 17: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.174266342927746 (code B ref 77186); Sat, 22 Mar 2025 17:11:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:29 +0000 Received: from localhost ([127.0.0.1]:45243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Me-0007DR-DZ for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:28 -0400 Received: from wolfsden.cz ([37.205.8.62]:57538) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MC-00074c-5I for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:03 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 21CF0380A26; Sat, 22 Mar 2025 17:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663399; bh=tEowydEfTXi/uoqWTYnr+SbPnCkFfTGGzISNrbVHb40=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oyfdTIiJAgSs3QQJ9PPGLBJWkkcXKlL4ELUXXk/zezlfOEdEUm5qIeaR1zNiG5t0l SA/G9pauSSil4cLNfJO/ukEeheroXJ4t7cqajbD+eiI7H/rdl9XWyHHUfTgzin39i/ UaBy1A3VgrKGQG8ksAH+0QIWQb0mx1fVZg9aE+Mq864cX6bjNsk3ssB4MfubCl+p0g z2U3mro9McmAOeBGY0wloww8otlaKo/MSDF2MJo/bcOkk1GKq9c6HP97dZ/3h2g9fZ aqnBNfyedxtPv6Dt8CimRtTrrI7cA96gFihcj5N+N0B2Z7N16rYXPYsn22kflKue6x LYqk/OwPe/MSeJKln0N3BQI8PqzSxErNkDd8BblKTxRvQZVGVtY8POIneNL3jXNM65 WTYirWYi0Jq6GkiiIJgMig3/VLisF852W0KrsbJ3vi8rgZdjkzDJ9FnB9GIGWjqpxl h5BXlHr5EcmltaXH8iLD+8rnojnGq4+VSuakLuH8kfuFf+Vn+I9QrSGE2Tc98Nszrq uOKWI5j1MLo1LgXk0N9yFSK54GE1gK7B6GFr50cE7pkhYgEZ/zO+A3eAScDvNmXrRD W7zR0boV4JL/Jl6NJ6hk0FCDQ6hVJEXa/rwx86aCDJS9BUhfQ9q1RT3WQZl2j1xHS9 YoMTTFSQ9KJSTU0jvrtyEcLc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8E3C737FE3E; Sat, 22 Mar 2025 17:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663398; bh=tEowydEfTXi/uoqWTYnr+SbPnCkFfTGGzISNrbVHb40=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wv6RFb1Jlh4gJLsboQ/N6cdRP2+IyT0kEmGZ4G83Nag7U60E49tqRZTDCBg+YhJFs Eax7NJJCgtAIkKqh41KQd5kEGn4rE0bebGNxO2fON1auIKTugQV8UDSo8RLHa3VMhG HijjpahQryQxIsToYTvPPUKAFEih0TxNujS6eKxW3/OTmA5d41GlJNmm+4BFyApXZz O6r1O/TEQM9oJwo/HUZ1m5Vs05aEQrHan86H7aeTz6hojhjR47thG6/VN7wEMiTp9E AD5OzEaOkZclVXVfoiRjPsA8AHFHmucFLrz6spspFR4AH5RW9ij8a+tAXGy4eAbI7a VV23BbEAVAUT7n9aRboLr+Fi0qlzLEGxt0xbsx3v5o4gxMWFZ/O2kW2URMTajbYxSs AOeHj7lw5DQGylcXhROL0AyzRTwaZjsLcA1EZhcg2g/3lMsv5GWqg8iSx+hMsqPRxh 9VG9lz91wSO4ks+iHnTtCSw198Sz8ndiHEe8U8sSKXWE0+flEUe3esGfPj2FM1ueVL gCJoZdX0zyWVnRUyu0CS46PPreoRPaT9gm6fyel7oR3tRG1l0mpnBd0TsEWetJIBwS ySuCAIrZIPEe2Bpmymb49lAHajYibbQsXC9d2hl30REe7y1CcpK42kF+oPJrMXhGdp ogEoujg7Pg4WeARsiRE4vOwU= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:04 +0100 Message-ID: <14ccb558fb3b3a17abbe4a549156174e16a69977.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add host-name field. (gitolite-rc-file-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: I1231ed47a294ff48b35a301f76ae8e9cbfcd9b95 --- doc/guix.texi | 4 ++++ gnu/services/version-control.scm | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3179d33cb3..2c7ddb2f55 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41154,6 +41154,10 @@ Version Control Services value from gitolite however is @code{1} (written as @code{#t} in this configuration). +@item @code{host-name} (default: @code{#f}) +The host name of this gitolite instance. It is used by the mirroring +feature. + @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 344538a73e..2b99e8db86 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -61,6 +61,7 @@ (define-module (gnu services version-control) gitolite-rc-file-unsafe-pattern gitolite-rc-file-git-config-keys gitolite-rc-file-log-extra + gitolite-rc-file-host-name gitolite-rc-file-roles gitolite-rc-file-enable @@ -255,6 +256,8 @@ (define-record-type* (default "")) (log-extra gitolite-rc-file-log-extra (default #f)) + (host-name gitolite-rc-file-host-name + (default #f)) (roles gitolite-rc-file-roles (default '(("READERS" . 1) ("WRITERS" . 1)))) @@ -273,7 +276,7 @@ (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) (match-record file ( umask local-code unsafe-pattern git-config-keys log-extra - roles enable) + host-name roles enable) (apply text-file* "gitolite.rc" `("%RC = (\n" " UMASK => " ,(format #f "~4,'0o" umask) ",\n" @@ -284,6 +287,9 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if log-extra " LOG_EXTRA => 1,\n" "") + ,(if host-name + (simple-format #f " HOSTNAME => \"~A\",\n" host-name) + "") " ROLES => {\n" ,@(map (match-lambda ((role . value) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 06/13] services: gitolite-rc-file: Export default value for enable. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11:04 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266342927754 (code B ref 77186); Sat, 22 Mar 2025 17:11:04 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:29 +0000 Received: from localhost ([127.0.0.1]:45245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Me-0007DT-RI for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:29 -0400 Received: from wolfsden.cz ([37.205.8.62]:57566) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2ME-000751-Eo for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:04 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id A67E5380A27; Sat, 22 Mar 2025 17:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663400; bh=jVldggccuakR+igEz1cVhftiIPlxjkfGybvZybbnbC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qHUOPyIFtOqR+WGmpoC73PUklJCflbS3UqVo47rqDIaK5ZJoZUL9y+Zbfcehw6nmd NP49uxb0cOy5CwRpshAFp+eQUlab5HnxTA96h1LZ2wos+YoYevu+dbj+Mhc4N5ij91 j9IYS7NZQy2zv4h0z1aO6WgGXlY2/LaGwS9dY+cuGZQ+5xuuNfrZpFgHHtgbX23tgq x6FaTRVadGWFr56T4thU4fgH83JztsPkJ2KjqUhrFp8fi5/mh2cX7THv5JqiIeWwzC 1hiUFUnYvbGPWBgQxMHI2ycuZV3YxzzD8JHSVWbZZsSYGSL61l/pWPuXVz6HwOiXPA ZSfF8cnWfRE/Tbl95T18M4UQ/rCfBAEgoem+bkw9Mh3C6sy4Bt9Wz/1X/SIyM5YRlW ADaioagNeHhl02yX8IqswCubDqxiKXHEzUGd+eu4OBodxho0zOvKxc8ZPWriWPR6Yz u742WWByZJSmJSMS+Jwo/ZQPtg6WuLrT7xc+UXrTTd/ksgf2MlmOetJhnqkyRfHvVP OQdu1oMzyvhPgdMx7dARUo+99JxslP3uQddi0sRWW3MEd2gV+3DHMG0nQbnF1uxRg6 E3davMX8kT3erfrtiQiXdlzktAZSDkf4nve3PJitQ9SyIHlDR2ttRE/2aT2Yq2RCfe dZ2+g4s//2Pfzq31edvaoChA= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1C31B37EA6C; Sat, 22 Mar 2025 17:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663400; bh=jVldggccuakR+igEz1cVhftiIPlxjkfGybvZybbnbC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qHUOPyIFtOqR+WGmpoC73PUklJCflbS3UqVo47rqDIaK5ZJoZUL9y+Zbfcehw6nmd NP49uxb0cOy5CwRpshAFp+eQUlab5HnxTA96h1LZ2wos+YoYevu+dbj+Mhc4N5ij91 j9IYS7NZQy2zv4h0z1aO6WgGXlY2/LaGwS9dY+cuGZQ+5xuuNfrZpFgHHtgbX23tgq x6FaTRVadGWFr56T4thU4fgH83JztsPkJ2KjqUhrFp8fi5/mh2cX7THv5JqiIeWwzC 1hiUFUnYvbGPWBgQxMHI2ycuZV3YxzzD8JHSVWbZZsSYGSL61l/pWPuXVz6HwOiXPA ZSfF8cnWfRE/Tbl95T18M4UQ/rCfBAEgoem+bkw9Mh3C6sy4Bt9Wz/1X/SIyM5YRlW ADaioagNeHhl02yX8IqswCubDqxiKXHEzUGd+eu4OBodxho0zOvKxc8ZPWriWPR6Yz u742WWByZJSmJSMS+Jwo/ZQPtg6WuLrT7xc+UXrTTd/ksgf2MlmOetJhnqkyRfHvVP OQdu1oMzyvhPgdMx7dARUo+99JxslP3uQddi0sRWW3MEd2gV+3DHMG0nQbnF1uxRg6 E3davMX8kT3erfrtiQiXdlzktAZSDkf4nve3PJitQ9SyIHlDR2ttRE/2aT2Yq2RCfe dZ2+g4s//2Pfzq31edvaoChA= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:07 +0100 Message-ID: <07f9cc3ac1ea9ea1eefea82da3c107d9f0792a8e.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-rc-file-default-enable): New exported variable. (gitolite-rc-file-compiler)[enable]: Use it. Change-Id: Ie6326ff69f3d454d96db6629dd5387757567d68f --- gnu/services/version-control.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index b93cb9f590..87f134cb23 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -65,6 +65,7 @@ (define-module (gnu services version-control) gitolite-rc-file-roles gitolite-rc-file-enable gitolite-rc-file-extra-content + gitolite-rc-file-default-enable gitolite-service-type @@ -244,6 +245,17 @@ (define* (git-http-nginx-location-configuration #:optional ;;; Gitolite ;;; +(define gitolite-rc-file-default-enable + '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")) + (define-record-type* gitolite-rc-file make-gitolite-rc-file gitolite-rc-file? @@ -263,15 +275,7 @@ (define-record-type* (default '(("READERS" . 1) ("WRITERS" . 1)))) (enable gitolite-rc-file-enable - (default '("help" - "desc" - "info" - "perms" - "writable" - "ssh-authkeys" - "git-config" - "daemon" - "gitweb"))) + (default gitolite-rc-file-default-enable)) (extra-content gitolite-rc-extra-content (default ""))) -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 08/13] services: gitolite-accounts: Convert to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11:04 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266342927761 (code B ref 77186); Sat, 22 Mar 2025 17:11:04 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:29 +0000 Received: from localhost ([127.0.0.1]:45247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mf-0007Db-6j for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:29 -0400 Received: from wolfsden.cz ([37.205.8.62]:57586) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2ME-000756-G7 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:04 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 7BDF437F2FA; Sat, 22 Mar 2025 17:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663401; bh=YZ3b4hzMtNlTHn5Xam8xsAWEx4PUkmpgYkfQkYwLMrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cm5PcCUInifA8BnK12gI21YdtZKi6rSBayGoFmwDMV19H42VjCSL3JedTxCdQFrxH qp8nlfWwPljs0l3xOWT9rfjR/VV9Km1QuuxGFm453r8oY40shU2lxyeAsps9cItGSq JhHuafeHcOBZyToyq0ioIH0QGU4V9W1HkVbkv2QjfBtJA4UVsbphrHFbuN1o3uwKnz UgFsn0KJzufgoyI/80BJq+agKNio3/8+B4Sj4Vuvl3YwHrHZGit5nLz7i+0StJfM4/ wI+JLqAjVGtnOoDGstJaDtbYYbLb0ETaxWgqiaBdZdiCQP4b3HvXv2nrQOGFf7i77Q OCoJhHtGsOUUheqe1rMantIUckquLlM/xkly65qnIu8uamRpz1JkU1zSFFVug+WRKx h8mSYfxrNV/0GKGFoj/Q1dbLNdh+K1+IE8IDKa78NhJzYwLFYIVXOqS7NThsJsxh+G wjgD81Ch7LxPcyj16IfsUZBZxj79ttOf44WiMm1ccb8wfh8W9ABdOrtbxHR8IRkwNE m/MhOU2xUjHfTRvJyz8bTfOwOAsxakFTS2zhvsFzpC/BLIA4SFx2gXkmwOaSXIT3bD 6cMLfCrix5Z6VWjII2grogiNmlv56+Cn9OLTZ2tE8BI1XjmAQhliQyoZ/W5mclc/RX MSAB8yvjid6iyHbJAxsi2v6g= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1C1B6380465; Sat, 22 Mar 2025 17:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663401; bh=YZ3b4hzMtNlTHn5Xam8xsAWEx4PUkmpgYkfQkYwLMrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cm5PcCUInifA8BnK12gI21YdtZKi6rSBayGoFmwDMV19H42VjCSL3JedTxCdQFrxH qp8nlfWwPljs0l3xOWT9rfjR/VV9Km1QuuxGFm453r8oY40shU2lxyeAsps9cItGSq JhHuafeHcOBZyToyq0ioIH0QGU4V9W1HkVbkv2QjfBtJA4UVsbphrHFbuN1o3uwKnz UgFsn0KJzufgoyI/80BJq+agKNio3/8+B4Sj4Vuvl3YwHrHZGit5nLz7i+0StJfM4/ wI+JLqAjVGtnOoDGstJaDtbYYbLb0ETaxWgqiaBdZdiCQP4b3HvXv2nrQOGFf7i77Q OCoJhHtGsOUUheqe1rMantIUckquLlM/xkly65qnIu8uamRpz1JkU1zSFFVug+WRKx h8mSYfxrNV/0GKGFoj/Q1dbLNdh+K1+IE8IDKa78NhJzYwLFYIVXOqS7NThsJsxh+G wjgD81Ch7LxPcyj16IfsUZBZxj79ttOf44WiMm1ccb8wfh8W9ABdOrtbxHR8IRkwNE m/MhOU2xUjHfTRvJyz8bTfOwOAsxakFTS2zhvsFzpC/BLIA4SFx2gXkmwOaSXIT3bD 6cMLfCrix5Z6VWjII2grogiNmlv56+Cn9OLTZ2tE8BI1XjmAQhliQyoZ/W5mclc/RX MSAB8yvjid6iyHbJAxsi2v6g= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:09 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-accounts): Use match-record instead of match-lambda with $. Change-Id: I37e3018513a8f20eeed8614dff46a63b8d7c2883 --- gnu/services/version-control.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index e39bb509c2..07984d309e 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -336,18 +336,19 @@ (define-record-type* (default (gitolite-rc-file))) (admin-pubkey gitolite-configuration-admin-pubkey)) -(define gitolite-accounts - (match-lambda - (($ package user group home-directory - rc-file admin-pubkey) - ;; User group and account to run Gitolite. - (list (user-group (name group) (system? #t)) - (user-account - (name user) - (group group) - (system? #t) - (comment "Gitolite user") - (home-directory home-directory)))))) +(define (gitolite-accounts config) + (match-record config + (user group home-directory) + ;; User group and account to run Gitolite. + (list (user-group + (name group) + (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory))))) (define gitolite-activation (match-lambda -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 07/13] services: gitolite-service-type: Do not install gitolite package. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266343027769 (code B ref 77186); Sat, 22 Mar 2025 17:11:05 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:30 +0000 Received: from localhost ([127.0.0.1]:45249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mf-0007Di-IR for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:30 -0400 Received: from wolfsden.cz ([37.205.8.62]:57572) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2ME-000752-Eh for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:05 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 10543380464; Sat, 22 Mar 2025 17:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663401; bh=E241oCd5BDBjw8ZaGsQGbGBpjoZqjisRErfytr9pfgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RKFp+oOpsnObGRUxbQXjwJIeZbj0o3QTVGZuti74JDx9eX8FkNLe1uBVlNNA4Rstc A1v6ZhuwdPXQDwqYk2mEoLw1nUTSRzWmt5QypQbW5GrZ8ScC+0kG1jakBtytsOOOcB vbz4Ti5Zs5uEVDTbbd1x2dcmpBTWMt8/X0YM+oUQRQ9BoyieC442Q8yCkrg11teLsA lpBtrleL9471bRqjVRCo7dwygVCdl3kns13MGogflYPMA44hKIcvzXDxeBRrwc8gLd +Snq1xneiyoPCbu81R/yAVcxDG10FdguhV0b8WJEN+54TKPXzNwDMk4vtwksBBR5JT vvg2+iGcnZ2Wy6wNiWzKeKfB+aAcD2Obs7q0p+dD5jCKPxh4ayTS76Aylls5c1QplX aiDqh2tlLXCWV4ACIclBRAgMverka9NC1OZl1ged/Ne/4wE2ryx4JDmgYXRuez/J5h ZBuk7rS4+5f0uC54khhLejCyJmeriaoVwdj8r7YroTFCbpkJVIYrsDxxA0FXQyfHwO Hv6UM6cbetkEg89CX0sj+Tij8szFZYC8At7QDCq0ldgQ0eWtCTHzAX4l5HoeBUwjnl h2PKPyhBFw27l7Fa46VVPinivi6mIEJFryi48E40HAeSbxG0H+VK25KGB8KY1lYXlF 3f48NxMO7vFD9DZmR2RGfjwg= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 98B58380635; Sat, 22 Mar 2025 17:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663400; bh=E241oCd5BDBjw8ZaGsQGbGBpjoZqjisRErfytr9pfgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nsOd6+IsBaAhmYguBsXldLoHM89iJA5SahmixLK6P7OckDHsaFZCsGBB5FXV0EOF8 Wr6Xm6t4MNOWAWgzh8wt6h7ylw6IM484ZtxNlxDcIElHHBm5SRDbN9XLB+c+9167rq Q3is08SgCjIXXQ/Pe6FSaCjB+FF6YTNrVR+Dk/dAhnkoI9OOR2KUbee3ErL0Bj6Vh6 WJAmKKJwtw7GIq+2ChHmb197eQyNxTrGEPZrIzIw7TjdtUsOqSsPECRafvSZJenF87 cKsUBM6+KoPYDS0Y3L8xg318GJMWLNa6wGLrhktaWAPrs7fLTh0m/1sQLjnOoeMZAQ un78wtzN7wppUL7+Jsp0Fij1thRjja025mPA3+GuDvzHuiDiPI/0O4H6zt58NZi1dH eoSiPCyyT9m/nRUNHJU4hFJLfPqtJklTkAQDyruwJlVrIET7DjrlqqDYT87CenDTcG 4NpOoCLNXcUp+VOZypZMvQsuEgqJx15d7+s5JGGzwZoibsEUza6LvVd1foYjpbkaL3 y6uU17KmJTrp5Aj5gJCjFs2XygfMJ7bBDxkc/zxMNi4s2ylDLA1lqFcO5Mb2paGyaB AlwQm15k3Szglmda5vaeauD00hyDYiiQuKhjaSiPWiBEv5gDtGtjd5dGbq6XcdqThR 1R5qsh8aRrfeRoiCPafA5yqk= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:08 +0100 Message-ID: <1e8a46dfc6861ebc9552ee2ca5ee17c6f48ccf34.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) It is not ideal to pollute the path with the binaries from the gitolite package, so adjust the package to support that and the service to no longer install it. * gnu/packages/version-control.scm (make-gitolite)[arguments]<#:phases> {'patch-scripts}: Use store file name of gitolite-shell. * gnu/services/version-control.scm (gitolite-service-type): Drop the extension of profile-service-type. Change-Id: I25459ccd80bda892b6d188b2b6fa99baee339cba --- v2: Add copyright. gnu/packages/version-control.scm | 6 +++--- gnu/services/version-control.scm | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8f244e0fa..cd624d3d57 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2025 Artyom V. Poptsov ;;; Copyright © 2025 Dariqq +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2365,11 +2366,10 @@ (define* (make-gitolite #:optional (extra-inputs '())) (string-append " " (search-input-file inputs "bin/grep") " "))) - ;; Avoid references to the store in authorized_keys. - ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") - "gitolite-shell $user")))) + (string-append + #$output "/bin/gitolite-shell $user"))))) (add-before 'install 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; Gitolite uses cat to test the readability of the diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 87f134cb23..e39bb509c2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -429,15 +429,7 @@ (define gitolite-service-type (list (service-extension activation-service-type gitolite-activation) (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) + gitolite-accounts))) (description "Set up @command{gitolite}, a Git hosting tool providing access over SSH. By default, the @code{git} user is used, but this is configurable. -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 09/13] services: gitolite-activation: Convert to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266343027775 (code B ref 77186); Sat, 22 Mar 2025 17:11:05 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:30 +0000 Received: from localhost ([127.0.0.1]:45251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mg-0007Dq-2c for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:30 -0400 Received: from wolfsden.cz ([37.205.8.62]:57590) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MF-00075F-Hc for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:05 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 67BC037EB7C; Sat, 22 Mar 2025 17:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663402; bh=v8Pnm4vHhClSIvEbarfZCgL9aVhiD0u05YjXi6ctQZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oYYv0GSSxzBJYBgUP/63p1qyo9n4TIxkMTUGgFpLcj+6M7ruQYvacWXc9HjqVBfJj CDmoER9rzTdc2/y/XM7dSUn5kKeymS9xVdMsD29Fe35PVRj5UXHHE1/TVLLR/jmcAa wMCWeKvwTOLR14aj/aEkMJtLe0gxnkqNhUJF87kDlEL+qKb7/jk78MTErbGZOFOc3N qbDpMUVqWEzCD6ryX7aR9WZl+l1N/z0zMZFutxL+0WPa6GkTFexBkpz02uF9a3Uyh8 dz4+rYIp/NEmTIOllMPQMbgOG6VCDscvu8dw3/knGFM0t5gg0x316T6Cfvsa2WZDeY ectdqegTdZ9TQSQoofUztdde/w8zvTiOOblyZZfa/yFGgLnLnP6FxEFtZpgBi3P7Nc Wn/TuzTTWtpQMkCCODPx8hPxMqRApP2qvYC7UUzwleOzMOMPqa8Voeh0efpOMsihrz xSkX2q7S/L5sOOKioM2wlJg8aZNAzI0hCZtRTxY0pmv7AMGMftFfk6kxnGid0o+6/D SmAnIqM4v+Dfp7Z6gMhiWApnPMXIDHcntTj1Ker9cmT6cOqHuTfQ6bt6bhvuaRXusk q2moS6kocaU9vCAb0InwGPmWzBbxr4xmcDbzJkHnJhwtuTkdffDLBX8xy2GVV/3WUU 0tpfKHgxAMbfOMDD+M2xPT3s= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 989C03803D5; Sat, 22 Mar 2025 17:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663401; bh=v8Pnm4vHhClSIvEbarfZCgL9aVhiD0u05YjXi6ctQZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yf4/0UyozEI4+N0MDN2Wknq/MxEI1wY4uAhWnKs4QUxQjh9w59fN/zkN+VCZaGtka Y2IZYZrSJvRrm221zzf4u4Z05nGNZ7pHrwV0U8NuGwJn/yYgdXLib+LDJnpMxCgr8z D/gba9ME4VOb1jEwBQWu3J0smmmuw2arTZTJt1e0fZaVWMwwhrhxSQ7XhrtOGBf5A0 G98FAzKlVr8+AwlkCntFLBUvHe3ELFRGRbM0C9/CYjZEREXg9/rPYor6i7ANP9ps0h +0UuXaTS2D8WySeIgZyizgtQH78py6kMD3BbU/a15EOqJGqNcq3I/Y/lO11bhcaj95 7gtMFzCve3hHhcAdpebVgMF6ZqIAsi47XpEDYQ2ll6XwfVr6VP4iH5MTHnWlo5VV8i q8tDCuRlSf0IRp1sbrZdrLTjGo78wDISiCuXOenIwvO38ld7oGyBk7zi2fMxDbTLmB Qyb/Zo8A6SkmUp9i4KFZMFyQs/Qjhc08XSKgW0ZQOO8znkDRbVHmpKSE0IkifKq1gB 5trxguyFWtwTpGnYp6txVul5tUzmvffiV1FmhRoHro/gAe9UpuMgq3+0k19UgibqWU LzlsBUNLfl7s6w+OBQMJ36L3CDiD6to1H+xo60PAwkmYxj0Ml/c0K0RsrLNHtZAGW2 w53POeZRepXjdxB3HekpNsOs= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:10 +0100 Message-ID: <708f8aad56c7277beb422cfd1d4cc45a0de233ce.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-activation): Use match-record instead of match-lambda with $. Change-Id: I37e3018513a8f20eeed8614dff46a63b8d7c2883 --- gnu/services/version-control.scm | 123 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 07984d309e..268b0a47ee 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -350,78 +350,77 @@ (define (gitolite-accounts config) (comment "Gitolite user") (home-directory home-directory))))) -(define gitolite-activation - (match-lambda - (($ package user group home - rc-file admin-pubkey) - #~(begin - (use-modules (ice-9 match) - (guix build utils)) +(define (gitolite-activation config) + (match-record config + (package user group home-directory rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) - (let* ((user-info (getpwnam #$user)) - (admin-pubkey #$admin-pubkey) - (pubkey-file (string-append - #$home "/" - (basename - (strip-store-file-name admin-pubkey)))) - (rc-file #$(string-append home "/.gitolite.rc"))) + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home-directory "/" + (basename + (strip-store-file-name admin-pubkey)))) + (rc-file #$(string-append home-directory "/.gitolite.rc"))) - ;; activate-users+groups in (gnu build activation) sets the - ;; permission flags of home directories to #o700 and mentions that - ;; services needing looser permissions should chmod it during - ;; service activation. We also want the git group to be able to - ;; read from the gitolite home directory, so a chmod'ing we will - ;; go! - (chmod #$home #o750) + ;; activate-users+groups in (gnu build activation) sets the + ;; permission flags of home directories to #o700 and mentions that + ;; services needing looser permissions should chmod it during + ;; service activation. We also want the git group to be able to + ;; read from the gitolite home directory, so a chmod'ing we will + ;; go! + (chmod #$home-directory #o750) - (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) - (copy-file #$rc-file rc-file) - ;; ensure gitolite's user can read the configuration - (chown rc-file - (passwd:uid user-info) - (passwd:gid user-info)) + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file rc-file) + ;; ensure gitolite's user can read the configuration + (chown rc-file + (passwd:uid user-info) + (passwd:gid user-info)) - ;; The key must be writable, so copy it from the store - (copy-file admin-pubkey pubkey-file) + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) - (chmod pubkey-file #o500) - (chown pubkey-file - (passwd:uid user-info) - (passwd:gid user-info)) + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) - ;; Set the git configuration, to avoid gitolite trying to use - ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home "/.gitconfig") - (lambda () - (display "[user] + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home-directory "/.gitconfig") + (lambda () + (display "[user] name = GNU Guix email = guix@localhost "))) - ;; Run Gitolite setup, as this updates the hooks and include the - ;; admin pubkey if specified. The admin pubkey is required for - ;; initial setup, and will replace the previous key if run after - ;; initial setup - (match (primitive-fork) - (0 - ;; Exit with a non-zero status code if an exception is thrown. - (dynamic-wind - (const #t) - (lambda () - (setenv "HOME" (passwd:dir user-info)) - (setenv "USER" #$user) - (setgid (passwd:gid user-info)) - (setuid (passwd:uid user-info)) - (primitive-exit - (system* #$(file-append package "/bin/gitolite") - "setup" - "-m" "gitolite setup by GNU Guix" - "-pk" pubkey-file))) - (lambda () - (primitive-exit 1)))) - (pid (waitpid pid))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) - (when (file-exists? pubkey-file) - (delete-file pubkey-file))))))) + (when (file-exists? pubkey-file) + (delete-file pubkey-file)))))) (define gitolite-service-type (service-type -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 10/13] services: Add gitolite-git-configuration. 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: Sat, 22 Mar 2025 17:11:06 +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.174266343527789 (code B ref 77186); Sat, 22 Mar 2025 17:11:06 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:35 +0000 Received: from localhost ([127.0.0.1]:45253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mk-0007E7-NO for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:35 -0400 Received: from wolfsden.cz ([37.205.8.62]:57594) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MG-00075g-92 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:06 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 2FDE837EA72; Sat, 22 Mar 2025 17:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663403; bh=rpAQNu5ecFY2+lEhgADPCwpqeCDjPDVaiFRFeSO5oCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bLqgid8bGsgmwziTEqft5oAH8fdKdXHpAg08DZ5x7eMxwuVkHNX8H/f9G6r0Yy1Vc wHkdSCeAvkNbNCkZtZ+iQfRpGvDyAmAxs2eJN0QVuafX0IthdMLBQF3JxnuW4MMQ9N JizakS4s/57i0rGy7mxH1P3hMQ+fi42Or20oIQMUpE4fs1czyGUeVN2bIBNxH3Rybs sCVrVBBMy9lg9ppBop2MTmWHcdQuw2JEB7LMSMSS2N96CB3s5xUv8WliTUlYstAby/ uoVk+ThjOHLrFzSEJjjfZ59JgLQVA6X6wQ6O7ck2lI/7aD5tefsz3DGPQL9BVPREkt i+BL9I5DqhwIcOlHO0rwXdnu8sZ7fQbnxdTlKnZraPoqQuCX0X7xQL0VKNOEEUxIKz LDGQnEB1GNj/RLbNqYzntJr+kYJZ8ikfxNBY4FDD0dH6fZ1GxiAdAHm8aQVAqaSSR9 kJLosrwVjz3CimUVIY3K/UDmDhvaOCpK10eio4vwqLmFZO8T1fT+g420UayTkveWyW WIkH8zIZTOHZ0MJ/Q6Byw907F6mSCWaMjrKdFsmb9jSXTMdWSo7cBwT6Zz2DpoLXF8 tGEBmCBJnsOJDqCDFib+moInE7GIGYGwD+DTcOY8hGLplC+zk8b6M487BDb1fXWdG0 /HJCvJJRzMO+TO17gUHT/ULA= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 2BE8E37F5CD; Sat, 22 Mar 2025 17:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663402; bh=rpAQNu5ecFY2+lEhgADPCwpqeCDjPDVaiFRFeSO5oCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BJPHpAkR2cbbQLiVutK0OybuPjX3GSmd3o43JOC7q/eTUOh21DwG37nfcjxQM9Uma ayhBpOgzl9kbT4Wsod0/DeoqV9h+bpctKF0JqGaTj+nV4NKQNwyqJ+AwVjW8nJhvBQ gwpJuWpdqVl/UuR87HRQVxMpakWhI+VO/+8cgSIbyZPz1Pp15EldTubw/787J8SiVE S50rG8h+6GACjSEUhbHEynS0Lce7yRHbK76ACKLg0foy/g4lApnX4p3BVozseN+7rv XIvQpmHvvDSLyxKIklw7Jj1S/iSOmODktOwh8DyjeoX12WCWj9yIME6RB2rC7aEBO/ 0z2Db+KEbITsbk4gBMxp6SSQ+UNkH3GPyP7DqQlnKqvvmeH+FQ+d2KZ2sqdz010seE 3pN3fLCaja8NpEPgBW6w3p3km0dfhzbMK1cD79Ktnua1kzvoQeTiXM+IzBppneRSs2 Z+42uvpDiNtdIHIsA9udkdOqOzW3WEvdYPh7zBnPrSkT7tmL2UnGZO4MRi+PKYWEJP wkd+W7aI7kIcfFoQpnyHmc9FC1G1fQG1iWP7f58azmkDRsLcj6kKbvEKE//jziNZS3 riGDhR3B72M86vuP4UOBpJnTxnVYY75y1Q/JB7whT9V/aYbMvfg67mISiehtiU0j6U RTsZbuv/mZiws+k2VZknJg4k= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:11 +0100 Message-ID: <7e43f73deff0dc29060e6f0dfe1c042e3d956a3f.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) In preparation for further customizability of the git configuration, extract the current setup into a separate record type. * gnu/services/version-control.scm (): New record type. (gitolite-git-configuration-compiler): And gexp compiler for it. (): Add git-config field. (gitolite-activation): Use it. * doc/guix.texi (Version Control Services): Document both. Change-Id: I7658698a93f938f62f41a4fa45b72de1eeb14414 --- doc/guix.texi | 17 +++++++++++++++ gnu/services/version-control.scm | 37 ++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e60fef9673..e584b072e1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41095,6 +41095,10 @@ Version Control Services A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite. +@item @code{git-config} (default: @code{(gitolite-git-configuration)}) +A ``file-like'' object (@pxref{G-Expressions, file-like objects}), +representing the git configuration for Gitolite. + @item @code{admin-pubkey} (default: @code{#f}) A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite. This will be inserted in to the @file{keydir} directory @@ -41170,6 +41174,19 @@ Version Control Services @end table @end deftp +@deftp {Data Type} gitolite-git-configuration +Data type representing the git configuration file for gitolite. + +@table @asis +@item @code{name} (default: @code{"GNU GNU"}) +User name used for commits (e.g. during setting up the admin +repository). + +@item @code{email} (default: @code{"guix@@localhost"}) +Email used for commits (e.g. during setting up the admin repository). + +@end table +@end deftp @subsubheading Gitile Service diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 268b0a47ee..dcdddf8078 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -67,6 +67,12 @@ (define-module (gnu services version-control) gitolite-rc-file-extra-content gitolite-rc-file-default-enable + + gitolite-git-configuration + gitolite-git-configuration? + gitolite-git-configuration-name + gitolite-git-configuration-email + gitolite-service-type gitile-configuration @@ -321,6 +327,23 @@ (define-gexp-compiler (gitolite-rc-file-compiler "# End:\n" "# vim: set syn=perl:\n")))) +(define-record-type* + gitolite-git-configuration make-gitolite-git-configuration + gitolite-git-configuration? + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost"))) + +(define-gexp-compiler (gitolite-git-configuration-compiler + (config ) system target) + (match-record config + (name email) + (apply text-file* "gitconfig" + `("[user]\n" + "name = " ,name "\n" + "email = " ,email "\n")))) + (define-record-type* gitolite-configuration make-gitolite-configuration gitolite-configuration? @@ -334,6 +357,8 @@ (define-record-type* (default "/var/lib/gitolite")) (rc-file gitolite-configuration-rc-file (default (gitolite-rc-file))) + (git-config gitolite-configuration-git-config + (default (gitolite-git-configuration))) (admin-pubkey gitolite-configuration-admin-pubkey)) (define (gitolite-accounts config) @@ -352,7 +377,8 @@ (define (gitolite-accounts config) (define (gitolite-activation config) (match-record config - (package user group home-directory rc-file admin-pubkey) + ( package user group home-directory rc-file admin-pubkey + git-config) #~(begin (use-modules (ice-9 match) (guix build utils)) @@ -390,12 +416,9 @@ (define (gitolite-activation config) ;; Set the git configuration, to avoid gitolite trying to use ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home-directory "/.gitconfig") - (lambda () - (display "[user] - name = GNU Guix - email = guix@localhost -"))) + (copy-file #$git-config + #$(string-append home-directory "/.gitconfig")) + ;; Run Gitolite setup, as this updates the hooks and include the ;; admin pubkey if specified. The admin pubkey is required for ;; initial setup, and will replace the previous key if run after -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 13/13] services: gitolite-git-configuration: 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: Sat, 22 Mar 2025 17:11:07 +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.174266343527797 (code B ref 77186); Sat, 22 Mar 2025 17:11:07 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:35 +0000 Received: from localhost ([127.0.0.1]:45255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Ml-0007EB-8V for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:35 -0400 Received: from wolfsden.cz ([37.205.8.62]:54878) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MH-000762-BT for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:07 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 504B637F47F; Sat, 22 Mar 2025 17:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663404; bh=aAAGsqvP4Bcb/PVdVVns/gkcyTE8Zf9QSWJ+7Bo5Enw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tHv4oLA0lWCYR9g8AykBQt8si+HlI6GZ0rggooIl3A0IkGSBSRIV1HeCdmuOYhlAY YwoRkmVhBkYlKaHmrMnqQ04fj+RzzVDUkadLGBsO5vNGjx1gcUOYARMH5lj+cJlXxO NFY4v9OYe4dl12bvG1GdRY+Uzc4FMO27o1gH/v1OesN/31JtBBijFKdHndDQV6D3NH +r9ICGqtFt3bilqk/h5WR9X9WkBKprj74Wth8WSDZlxquJKlG0nUAsQaEkPYXMopWi CyJi6kzQcGRwhnIgL7/qS71Imi0hr4a+j9G3AmAlNhQ5nxQDzNFEqwv3oSr6Fuy0qW sqa6lve6GT7gn9rcKutk0idSVvihJEK9+NLA7s9DjFrzol8RsPceekreu9PmjcQtCn zB4ddMnwThMe8x96bLNw3PLMOyBc//wN55Tj745H1BGqoLZHeJmgcKLDAuQPwKR19t LQr6COO9boNbfJs7Eyy2NLdeWlW143mby/kZSqZ4qJIGL69BFW5/egbxuEWUEXt2jC hFxRGHATxMpbW+HcT6+Rg+00sdbmwJVR7hhrXwBRnS+5I/cTFux0b3F7UwdQtZHoxu C+mxVVLlHHmY6fZirSmXSapD374Jrb620cWOOOSozJkxErUX7wMy3qhPD6pQuL3QHp kgiByLa0bXqRSffPmjWyCIfw= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id DA39F380E85; Sat, 22 Mar 2025 17:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663403; bh=aAAGsqvP4Bcb/PVdVVns/gkcyTE8Zf9QSWJ+7Bo5Enw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WYAhCwKy2aiojXoaLds6uuHyddHeXfmb9RGpAiOEj3ZmCXhFWmJroBeis1zKWF6Hc lLPG7Xom3rjIyhmQj8egql9t2BbQ6T/SLfzFBJmtva583RA0vnOo3oxQgeLnjJLpbf ftf3L+beUkqED/ZBGRP34cIkTK/LuDIHODr7tcWnwQZKU6TipwpnpAPmBMe97SBEjQ yF2Cf2K0k6PKkkVnoED//Dmz8rsxhGuhgld36aMQJknimsJa922TBEOFZwLQbD+Uso liVGc0hicDTvyNg0vqvPs5UCGfuJcrAb04ATQ4h6t0qKFeoHP6C+NriHiapmPxXKmI NatjkW8pqky8U5g0YwXSGyCffP+SdlCMpZGCgNFvMU2bD29xzvuqAaQBgv19PH8qLC 8jhF+7Ei5vS94U2wt5sdJzD883665PwMh92GxVl8URbYsjf8S60pcytySaElY0lloi mNfRWyygSSOzwxTqp8lzTLQhRMAxiFR8E/3Q1P8bDMw14RrWDL/xgG95lQgMsvROtg J2glVKWbOvctEdG7ZV8KpDIobf5FqP/Eh9m1cbT/Wt9dJ5aY9q6QVdOvMzcQ7zDJj4 vL376uDF0qoS8qm46Delak0/u2cvGBNRUertSAGw+N9q6EMA7M3I9VuGOSDgIkmCon t3Aj38VPPg7iV/XVT599U5HQ= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:14 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add extra-content field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f8fa1ab3bd..311564c1d2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41192,6 +41192,9 @@ Version Control Services @item @code{receive-fsck-objects} (default: @code{#f}) If it is set to true, git-receive-pack will check all received objects. +@item @code{extra-content} (default: @code{""}) +Extra content to add verbatim into the git configuration file. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 1e21174ea9..e73e77e0b2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -74,6 +74,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-email gitolite-git-configuration-default-branch gitolite-git-configuration-receive-fsck-objects + gitolite-git-configuration-extra-content gitolite-service-type @@ -339,12 +340,14 @@ (define-record-type* (default-branch gitolite-git-configuration-default-branch (default #f)) (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects - (default #f))) + (default #f)) + (extra-content gitolite-git-configuration-extra-content + (default ""))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch receive-fsck-objects) + (name email default-branch receive-fsck-objects extra-content) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -356,7 +359,8 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if receive-fsck-objects `("[receive]\n" "fsckObjects = true\n") - '()))))) + '()) + ,extra-content "\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 12/13] services: gitolite-git-configuration: Add receive-fsck-objects 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: Sat, 22 Mar 2025 17:11:07 +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.174266343627804 (code B ref 77186); Sat, 22 Mar 2025 17:11:07 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:36 +0000 Received: from localhost ([127.0.0.1]:45257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Ml-0007EJ-Ly for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:36 -0400 Received: from wolfsden.cz ([37.205.8.62]:54884) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MH-000767-Mb for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:07 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9879A380AAA; Sat, 22 Mar 2025 17:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663404; bh=Q+5XCEUSdpYhaLd7jogHtdqM+S8oyZoJsYDXaa0tjKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=w7tr5p55rVZANDujGjy5QGoDAkkEbD/WARwnbT6+ggZSSl01DIOzoI0WWFA6GwQKl H0lNWMwoE35xUIzxTXIkfhROENfTLWMVTMhnB/Tp4TKxz8SUzzo+HtrdtWw52B4bQP VR7PbsaW2dcNEbCaHve7pEF2ihrserxG6iVtZh4mldeRJzv5bXIOnRYluEkeYvRnkV aHJMK8DcisfgcKE4toLW90pGQ0AQpCEnkTuXikZq2B4zh5+J/DSSq0XS0blIoyp4PJ zzT8dYWEp+QQ8ji6M0dTREHYHF0/xQyJjHGF8yEngpw4BpsI7Cq5vF38m/7UBc4Vx7 XU1iWc6WdU7yflUgr1OlZ1B8ztKlmxQbOG8fXD+4g7KI2F95Xi3khuaWQe2fGHaC+7 uYZCMv3L70EpVoypxKv8CNtRMDj1MW/yTaK6wowitjU3HqQWJj7R1GFNP2IexQo4zb AKk8aWCkt+wZzsb9ZlhBQWkyCDt1g59WBDlPeWc/uQ57DmtHk5bdyOW3sJf8rNa9Ov eNyCgPCqeMiBjj4aFiDVlZlcGvkZnbLTyNn/R2ybAliErkDNahPlgoQUFGXwmxQuvR RlIOHKWA+arPN555XDlccYN2wBsD+y3wTR/wx652SjTwTN5FBnBmWx9cVwj5n2BObo TJcEhCFIlL1HcQXC4eCl7FRU= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 5439037EA74; Sat, 22 Mar 2025 17:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663403; bh=Q+5XCEUSdpYhaLd7jogHtdqM+S8oyZoJsYDXaa0tjKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OB8SplhRray3mm8ArsffIqdX+WwFblZWpl9WCVfUIEoCJVxTiriIkHHRJN5nj4yBI kXuqc2cC2oFbYNjAt7Wci+eQ55EQe0D22blgfoiol9Xml68gJl+aYLw0SbRDkfNQWM UHYnBN+Gx0ommQQXDebxVy6sKex8PaDDBvdlstU4RAfp6V5rBJwu9iGAkdP4pDUbZN IjXNk/T2jlrYiMrEFhxIxPcVk86WABYYxDLczFVcyupAcdTLZUSC706/DgzUuFEACd BmoRWXTgOLe5c1YalgDfrULG073rRyeDLSUFCRqpsFg3rJkhhwTnoH6g4rHJArUPlV EJS+BQqeyJ60+dyrJvv5FvmCNIKqXjwusXLOBs9lcQV71QAFr7R/cD416r4JkLVd0K rr6IGLLt2uLkaMkos2hotOQ47s/Ez3ahVRwB12zS19RT5nMETcGz2UrOQUh4qB5AP7 JcHbk2h7kZsRxwlmqmWl0KE9AMJUAT0RnuNNcUe0i00whSTAru7KDnYfZer01Ywp6i rbgDPxr6zYddgxG86y/T2iNqoxsUi0jS+DIeEf0gDKhUA6FQk6C0qvX9YNS47XTqER uL+01nU+/qsSfmYCd+BZ4dK0FfWINB/x9fe4wWDZsGrS3NMhgf9YsRPt6u0wANZKUc r9X8B3f84OOTZeOkhBvqCqRc= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:13 +0100 Message-ID: <052ce86b6068112d360d5869adc1455b92ca4157.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add receive-fsck-objects field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3332813a02..f8fa1ab3bd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41189,6 +41189,9 @@ Version Control Services If true, set the @code{init.defaultBranch} option to that value. Common values are @code{"master"} and @code{"main"}. +@item @code{receive-fsck-objects} (default: @code{#f}) +If it is set to true, git-receive-pack will check all received objects. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 12653b3cea..1e21174ea9 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -73,6 +73,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-name gitolite-git-configuration-email gitolite-git-configuration-default-branch + gitolite-git-configuration-receive-fsck-objects gitolite-service-type @@ -331,17 +332,19 @@ (define-gexp-compiler (gitolite-rc-file-compiler (define-record-type* gitolite-git-configuration make-gitolite-git-configuration gitolite-git-configuration? - (name gitolite-git-configuration-name - (default "GNU Guix")) - (email gitolite-git-configuration-email - (default "guix@localhost")) - (default-branch gitolite-git-configuration-default-branch - (default #f))) + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost")) + (default-branch gitolite-git-configuration-default-branch + (default #f)) + (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects + (default #f))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch) + (name email default-branch receive-fsck-objects) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -349,6 +352,10 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if default-branch `("[init]\n" "defaultBranch = " ,default-branch "\n") + '()) + ,@(if receive-fsck-objects + `("[receive]\n" + "fsckObjects = true\n") '()))))) (define-record-type* -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 11/13] services: gitolite-git-configuration: Add default-branch 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: Sat, 22 Mar 2025 17:11:08 +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.174266343827840 (code B ref 77186); Sat, 22 Mar 2025 17:11:08 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:38 +0000 Received: from localhost ([127.0.0.1]:45259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mm-0007EP-3e for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:37 -0400 Received: from wolfsden.cz ([37.205.8.62]:57596) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MJ-00075n-E6 for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6283837EA76; Sat, 22 Mar 2025 17:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663403; bh=BV+BrEyDw5lVblAZ/zMBfsNslphXhyB22RcUeRl+E2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WeEE8dzvEupOwJYXIPd/rLkg2qL9nP0BujRH/dUK2UIqOU7WK3IIgsbo/rlaWhpgr 2uCc0uRMxmEmK2/8F8LwJ63Pb0YBr0V9Pe+t+7kDruLEw2oPU9IeROd2JfQ8DS6dcH 4VGstfmCQYStcUP0h5th6H4Vd9n5xU5+npAJygRwsdEhg/PB5kAr9wjLr/53/7njWX DQrxfzXuh70/OvoO5A7cwoa3/jBgRIGyujOluuqMXzT8WqLSVgsYVRyjXL5dRNeoQR JyXlE9CCiGPAdsCXgXePFmYBWcxxo4vj/yEhqPFTgn2Ydlm355mGC31ZbKa0srKMDu g+DLrq3JAD18DB+7Ixu8crv2kLwgd/HJa2sHsL1X0fOD0ay46PzcQ0gvnXAJdFpfn7 mg4p3gtIrh9d51qTU7t6iPtw3mfuy45k+BGn4cd7g3MEAk4lrZKTllNMQ2DXN5WDqZ 9zrWwfwPqrhX7vQuiD5iYjisr0wdS8Rm4nGlZAJPuTmErazB5BKgEyiRSbbs5U6+3X UN/AgCBA/CkLe7g1MDDz46j6f50zZuVWP9pCWlyOZZBQjnXxoCErAPjwKMqeqnu5ey POy7MRC91G9UK4l/1Nt4iXcdSvqAESr3TmYn85d99y3dBr7pdRHETJZKdXz/BL8ukX cy1w7BvdiSPtjoXcZ19ROuaM= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id B253738078F; Sat, 22 Mar 2025 17:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663402; bh=BV+BrEyDw5lVblAZ/zMBfsNslphXhyB22RcUeRl+E2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W/BT9v6MOdIQETx9zvhtGu4sLGMv9g6UrRsgODh72Y/bEvgW76SwLwpkIk7S/Y+/x twh/EE48zqvxJOgOILrVxqlJOi0dyrvs7FQEyI0oEcLFDdtD7p5jwOm2Bj3gsDVwub /57dzDcQRHm0SRZRWAkHqDa0y6MENN5lE/+tIin4xxCHTxy0/S/Ep/nRQSgJ4P9EA7 kz0NCtYbIZWLXr1jPTdWgdhdX09WucJaezMInE4trf85hth2FHxmD7BoJZSLs3EiIK DIO7xg0PyHKiuSQrggB4rkAnU8dtctLaiHJSYaFAtB7jFDFlTmquWFduNCCeOCwfuL rFccdwBON3C0Peu1PaTrBr6CMxL8KHd/qfIhHca0b7Qxm2+weDlZlP8izEGL/etqpU pn7sEp12ZR9ZDRlpOCOJmdUZAIeoo2Chf8txrffERFZ3/Gzmvjt8wwk6H1k4uNb2fv GBVoBdee4EEsJ+B3GyK4nffaTGNanYYFS20egdc0roeVl+wFNOEYUxAUMznL1hWKuc /mBL2akH6BI+9TwKzEkWyfy/kAZKrB9GeLt92r/iyGd8GlTAf2tkerknVY4yYpja+U cz+UXuNpUWnKjIEnubqgODSTNXDYLG9BZwjpGcfu8jsBcKDhA+dL6wA6qbpikVIMKh K/aay2UygcVwfhxW1zjsxyxI= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:12 +0100 Message-ID: <871ecd2df2e7632bf18134424874038074cb8065.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add default-branch field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 4 ++++ gnu/services/version-control.scm | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e584b072e1..3332813a02 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41185,6 +41185,10 @@ Version Control Services @item @code{email} (default: @code{"guix@@localhost"}) Email used for commits (e.g. during setting up the admin repository). +@item @code{default-branch} (default: @code{#f}) +If true, set the @code{init.defaultBranch} option to that value. Common +values are @code{"master"} and @code{"main"}. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index dcdddf8078..12653b3cea 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -72,6 +72,7 @@ (define-module (gnu services version-control) gitolite-git-configuration? gitolite-git-configuration-name gitolite-git-configuration-email + gitolite-git-configuration-default-branch gitolite-service-type @@ -330,19 +331,25 @@ (define-gexp-compiler (gitolite-rc-file-compiler (define-record-type* gitolite-git-configuration make-gitolite-git-configuration gitolite-git-configuration? - (name gitolite-git-configuration-name - (default "GNU Guix")) - (email gitolite-git-configuration-email - (default "guix@localhost"))) + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost")) + (default-branch gitolite-git-configuration-default-branch + (default #f))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email) + (name email default-branch) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" - "email = " ,email "\n")))) + "email = " ,email "\n" + ,@(if default-branch + `("[init]\n" + "defaultBranch = " ,default-branch "\n") + '()))))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 04/13] 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: Sat, 22 Mar 2025 17:11:09 +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.174266344227901 (code B ref 77186); Sat, 22 Mar 2025 17:11:09 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:42 +0000 Received: from localhost ([127.0.0.1]:45261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mn-0007Ez-W0 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:40 -0400 Received: from wolfsden.cz ([37.205.8.62]:57544) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MC-00074d-Gg for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:02 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 7D53837F93E; Sat, 22 Mar 2025 17:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663399; bh=oIRywjcbaVxrHIDAWDnpoerUNSaoYkMpJPOKISN8Hs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FSymUdnqWjRoQZEV912+zgx1wADOeuzVfj0VR2WtJa6a2xhLtlno4LWxrqvR1+f++ 0SnSBuAe5NLNT+OQMYOLEeLg1d/KRiU8n9TqL0AT6uRYPSx5G0KBN6HFti3PHGXIsZ wdEGJdAV8c8rcYiwsyZGUBmC6pBeTBb3KXFClIO11B3Y2SK+1E4FcwDtmg72ml5ssN aHOGuaV5WMPsEmjN2nB6+rBQlIIq6JUKcMMODjsYUxCJy1SuwxrFtjNuiNWAJBtWZw zrpBi+799MiXi0bo0SSJBfUPFLXxIeH+mX6eUvgYiqAyJIwMnrmI28AiakLwgv7UDi VN2o/CVh+uCLLCqqfN9Ds7wxMktgMHqERV8bLnrWLUfAGe+530YWsbkul+pxe9o7nL Q1/ooIvXDt9ZsoDp+UPuxa4bX5/4pDU4G+NMEbWZg5aXgH0rkRh0m2BdMiW0e7+h41 g3Pxs8yTi1d3zXvQs9zDj3lJfEdtlCk4G4lnHTOedvabjoqh6GN6D3kmBXmlXvwKz1 k1LY6K7ioebpSfl5z2NlaiFxkRb3vRzxIQ47o5heRcIJoE3mARbyZd/X5JoBA/jd45 7dK0O2aYAoVnWDC5YdKM5fh195H+rVohYfGz30RCvOND/QmnfYPvyeRRYTI6u/vIIH ZMUOn+daMrRpbqomnKIv8TfM= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1B69A38080D; Sat, 22 Mar 2025 17:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663399; bh=oIRywjcbaVxrHIDAWDnpoerUNSaoYkMpJPOKISN8Hs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FSymUdnqWjRoQZEV912+zgx1wADOeuzVfj0VR2WtJa6a2xhLtlno4LWxrqvR1+f++ 0SnSBuAe5NLNT+OQMYOLEeLg1d/KRiU8n9TqL0AT6uRYPSx5G0KBN6HFti3PHGXIsZ wdEGJdAV8c8rcYiwsyZGUBmC6pBeTBb3KXFClIO11B3Y2SK+1E4FcwDtmg72ml5ssN aHOGuaV5WMPsEmjN2nB6+rBQlIIq6JUKcMMODjsYUxCJy1SuwxrFtjNuiNWAJBtWZw zrpBi+799MiXi0bo0SSJBfUPFLXxIeH+mX6eUvgYiqAyJIwMnrmI28AiakLwgv7UDi VN2o/CVh+uCLLCqqfN9Ds7wxMktgMHqERV8bLnrWLUfAGe+530YWsbkul+pxe9o7nL Q1/ooIvXDt9ZsoDp+UPuxa4bX5/4pDU4G+NMEbWZg5aXgH0rkRh0m2BdMiW0e7+h41 g3Pxs8yTi1d3zXvQs9zDj3lJfEdtlCk4G4lnHTOedvabjoqh6GN6D3kmBXmlXvwKz1 k1LY6K7ioebpSfl5z2NlaiFxkRb3vRzxIQ47o5heRcIJoE3mARbyZd/X5JoBA/jd45 7dK0O2aYAoVnWDC5YdKM5fh195H+rVohYfGz30RCvOND/QmnfYPvyeRRYTI6u/vIIH ZMUOn+daMrRpbqomnKIv8TfM= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:05 +0100 Message-ID: <3ae90a9c51dc9508f324eee1d32002a081d93c33.1742663354.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 2c7ddb2f55..e60fef9673 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41164,6 +41164,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 -- 2.48.1 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 02/13] services: gitolite-rc-file: Add log-extra field. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 05:41: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: Tomas Volf <~@wolfsden.cz> Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174305406021667 (code B ref 77186); Thu, 27 Mar 2025 05:41:03 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 05:41:00 +0000 Received: from localhost ([127.0.0.1]:46684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txfz9-0005d9-DO for submit@debbugs.gnu.org; Thu, 27 Mar 2025 01:41:00 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:49329) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txfz7-0005bh-8P for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 01:40:58 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22622ddcc35so17383785ad.2 for <77186@debbugs.gnu.org>; Wed, 26 Mar 2025 22:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743054051; x=1743658851; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=SP0fMCCHZ9e5SV8KVCH77ZsT0NyPR30KFrLY3utj4+Y=; b=nBJGmd9jKUoeU9J5QCGGSvAqHkA3JJZzsT5/L+oHy7fCu3w2pqNP4xHuiMbQztM6zq geCIAqa85QpDNpwGpV8lAHmAYov4t+5/2BaKv70IIAZgi1v9qLj1vkH97HdS9JgYr+Un zbtwlHw9PHI6ht/aRku+GdAjTfwXqxOBhFfDXCRxWyTlunHewA8FYROPw9JqMhkdrhDO 87gEtm+BWnZiAEiDxRUDy+HngO+BhscaAllQ4q4NihIB1ubH/WNQz15A02hU57Azl7lS /Q63WaJ63oVvOb6Qpjo4ctmoUh8FMDEGmPQzd0bdcJ/C/kuIOYsCkEvRLL6On/ECxfAL EWjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743054051; x=1743658851; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SP0fMCCHZ9e5SV8KVCH77ZsT0NyPR30KFrLY3utj4+Y=; b=b8XsWxT+FBB0a6QR7+x2OTFfaE1Digm1kDB9Tzwf8HMqF6WyR1D6iQjRPBQaQR6e/O 0dIpZN6tjNQZ/96ukhQfIv0QqzAPqgKzahQQ56oCx5qvph8bRC3m8RX+knPVyGpPeTCQ XBynOllqxIbZtrTemKCq1+956uUWxprT8GTiFtClvJSUQVkA/5u1rSSAynZtVJq9OcuZ SKyVJnaykHpu6oCzccHCB0oI1FNBSJdELWshU+5nnYJT98A2tEIWpMiLcvOOZpsJq0Fq T2dcVgMI3QIzmpi+tpcAkbTdTojtMGKaWmBbv1zoW8x+3+orCpBAm5pvS5ZmvMld7O8U ZmcQ== X-Gm-Message-State: AOJu0YySsxS2rvQO2AsX3L2fby73NXuP//TmUKxTFpQCdEZoGKfpP9L8 QslFMLdkamyxSFtmJENxyUXBpMWamxeDwX7igqaRhZsSL78plsXT X-Gm-Gg: ASbGnct25ydOaEnOB01QncskTTK2uKz/UGRBPIq/JufXIo192QetKKcnuJ1O1GI1lOi +WiuYuvGetUxvYFpTIayA/rbtRnJWcKZnqSKMXDeu8Nu5fEfw2sL9Nhd0fRcKS424T5yavPbAV9 fbip0KjSJi4QNHuBgyd2ktC3gKQaslK3XuFJ1MdSkpkxqIMi7wHsalf6I0mleW2Tazfek6hCL/t nZ8ru909jt0hVOEGwquYWN6AQfGRwybAMZq1+XNA0yBz0KQ3OqIjWvW7OXZA2ddwXdp9DzqG30m SRAPpgGGtQ1n8/jtTb9qobfv3ccVCMo6rru2fK+jaeY= X-Google-Smtp-Source: AGHT+IH6ZZhKFLSItbcJFWBdJLM/0jevJmCCsZe83olYrVABje1ptuJAeCeM0WzT+R1qQi1Rsp/TGg== X-Received: by 2002:a17:902:ea04:b0:224:a79:5fe9 with SMTP id d9443c01a7336-228048da238mr25767535ad.30.1743054050670; Wed, 26 Mar 2025 22:40:50 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227e2fd5cd1sm44876145ad.31.2025.03.26.22.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 22:40:48 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (Tomas Volf's message of "Sat, 22 Mar 2025 18:09:03 +0100") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> Date: Thu, 27 Mar 2025 14:40:31 +0900 Message-ID: <87frizxc8g.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi Tomas, Tomas Volf <~@wolfsden.cz> writes: > * 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. [...] > +@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). Since this is newly introduced, what ar ethe historical reasons given? Shouldn't it follows the default upstream behavior and default to #t? -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 04/13] services: gitolite-rc-file: Add extra-content field. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 05:44:02 +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: Tomas Volf <~@wolfsden.cz> Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174305418622784 (code B ref 77186); Thu, 27 Mar 2025 05:44:02 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 05:43:06 +0000 Received: from localhost ([127.0.0.1]:46698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txg1B-0005vM-UT for submit@debbugs.gnu.org; Thu, 27 Mar 2025 01:43:06 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:47304) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txg19-0005th-Dh for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 01:43:04 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-303a66af07eso728433a91.2 for <77186@debbugs.gnu.org>; Wed, 26 Mar 2025 22:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743054177; x=1743658977; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=YSaqEx86wmadPwwJNID25WpPM3QoL7aT8WzkMmx/GDo=; b=EeJRRb2M2xFCGCfKVpNqjJES5nbHrOEe3QITCbK8JjgocQkGUrqL7/oR+hSFRH9oNM o9NqDZUhEvkLPcs5GyiGcidILB6iFepbTgGzbqTn1ZKcoDfjcoWlE2e8rc/5iO3dxbIC B1AFxUIVK2THucFyi0DuTZjy6Lpg140NjEVFqIpLcQMsTmaWxFokOMo1HKLL/IwlCGF5 Kh0+Wv7PtEV0wg8DN2jkGdcB0Tk/fW92s+3dCgHJpnlxh1bj0Jhqi4Ja89PuYJqbr2fc iMldVgCAVEA4aheEHhcHPKtw58Qj8kqoKbdrUEYLpr5mjZM5UW4RbLrAGE6E8u4sPcQ/ acdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743054177; x=1743658977; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YSaqEx86wmadPwwJNID25WpPM3QoL7aT8WzkMmx/GDo=; b=CxhXDZKyqaZhcIGXkTSkbNrkd6pJ18NA+wG/WCLPsJLJ2/AG5/SMAjQnDHsJZ1Wu/a vPRDNcSeebvDZS/ADnvIxzj7hlYJgwN+vzA0xTGz9bDfoAB7azIv95tTSbjJZK4nGP4Z prfYR9sWSdHP/WFzNCZgaoIy0evqCNDXyOQHHMqcNwY4mJfL5njsSgPupTOUC4rmwAzK px5rvMM5uUVtVzCXERkJksuKj9AS5mb3WDyJo8UjUHY2hlrt9752/tSv7GaWgXZ52ceS kS5/nsI3FeeIOhtWEqFgFSUQxDpzPFEmn9JUaaTGUiBmkzuXYkBWgdWl7VXrTneG3Ih1 JW8g== X-Gm-Message-State: AOJu0Yx3ixcUmF6vkV9aVw0mmJt8HEexmaGaLtikSjb1ASiBv0+HmCsi kkZc72ZLBRq99sx6DFttvM8EIvOmPtit9ekWKjXzPoucQEtblA0y X-Gm-Gg: ASbGnctpwvjI6xebTjyELukz2BNbYfjcfvfwUpOoNJjdpO2qhRZ3OFWyxJS6gPUNklm U8w6fOOgem71XUj1ohQ5hk7d9hamtxo8u+VpT688WJs7F39r2Qx10T91jqLioFzt0vVscsEJ8KX UUJSxusCbwbcRbvgr7gM1OvRQaW324YoxCMH8Dh02nH+4kbB9K4c0vVW1KgEpigVfzCpgp+kEmg KKaPIhzVXkj5lGYj+FsiEmEnXAc7cLuXhTQd9os8MYh5iRSEamwbW3bGDNEP0hrynF+Uqf1jj5N bZ/ha6XNyvxenzcOD5FvEwSd7yli6f2+GI0jT9l9PdY= X-Google-Smtp-Source: AGHT+IFXtuYcNH6oX/8U3FF3oHYtQ5pEiTsHOqFdKPfZxeobygDDch3XrmQP4peGRMH3hnW6BveM+Q== X-Received: by 2002:a17:90b:2808:b0:2ff:58e1:2bc9 with SMTP id 98e67ed59e1d1-303a83c3fd6mr3436078a91.25.1743054177026; Wed, 26 Mar 2025 22:42:57 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22780f3966esm120302535ad.13.2025.03.26.22.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 22:42:56 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <3ae90a9c51dc9508f324eee1d32002a081d93c33.1742663354.git.~@wolfsden.cz> (Tomas Volf's message of "Sat, 22 Mar 2025 18:09:05 +0100") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> <3ae90a9c51dc9508f324eee1d32002a081d93c33.1742663354.git.~@wolfsden.cz> Date: Thu, 27 Mar 2025 14:42:39 +0900 Message-ID: <87bjtnxc4w.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, Tomas Volf <~@wolfsden.cz> writes: > * 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 2c7ddb2f55..e60fef9673 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -41164,6 +41164,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. What is the %RC hash? Otherwise, LGTM. -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 06/13] services: gitolite-rc-file: Export default value for enable. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 05:47:01 +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: Tomas Volf <~@wolfsden.cz> Cc: 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174305436324670 (code B ref 77186); Thu, 27 Mar 2025 05:47:01 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 05:46:03 +0000 Received: from localhost ([127.0.0.1]:46724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txg41-0006PT-LC for submit@debbugs.gnu.org; Thu, 27 Mar 2025 01:46:03 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:60760) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txg3y-0006Ny-U5 for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 01:45:59 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22438c356c8so13579835ad.1 for <77186@debbugs.gnu.org>; Wed, 26 Mar 2025 22:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743054352; x=1743659152; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=vy42q3Q7i7SwBwYmNtJzZpj+9wHm1GlqBVHwKsJwdSI=; b=jalWEp3BkNl3iQ9334S0vnxVr1zxXL8odJZJOJGOIF7PFlBZnQ04lHn6TN7i6ScHNa aEdK39obsTNWzXb5pcv5wDXXQO6AssTPvOFlaO6GdBQ9luMXYOPlYq/xbAF0sFBs7BS8 3+qE8xiuzvYh6dOffGxu4ztgdeWeJTAF9Sdku6Fegog15IxZkFxmAmR42DsNIGDKwKtw iQRHvB6zk4qcSTQEOWC99ZglG5keusSQTXl8+Vy8CgnsFGC5TfAlZyd9w/4a7UxrbLuA 1PCg8XTwipu1cltwfUlY9NRqzH4zYk7SdkjAUtl08vpkZc73P5wtBQHcOPRr0aHV4YfA FGNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743054352; x=1743659152; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vy42q3Q7i7SwBwYmNtJzZpj+9wHm1GlqBVHwKsJwdSI=; b=IJlPCBe032QYW6oXcSwczULx6cuwBxEcS0Z8mR8/eENxmMqnTGk44eAGg3I6SmTtFI 6Q7YbQQnvqjUDNCG/B0byT4ZYI++qgwTvcJf8x6YlcdudflMKfEIrL+C5FxI98kbo0Ka v4Si02f5rQ2UCEnUTqPurM0pwmQj6WbOO7KMucHdQIAoQT8alkJYF7MmhT1QT3FzBt3U nN4Eb2KJ1wogU9yJ6I435+U5Fi8LdjVpDepqYSDaRSIbSPJCW3dIX3Sn4FKrEzdnjpLx 2JeiJhEpJwPRbtGpNlPi0Xq6qhJ4Ca3SAtp4iSOLSJHljWvqOSh7yn/pVIcKfS4MKcy3 jUnw== X-Gm-Message-State: AOJu0YzkhKTyUa7bSgDIrKzFJvazuIQjAJkpkPgTbK0mv6a1pda/JZDZ PK+GuxYoT1y4HWs2C1Ik1Tcr1sSo21RMkYsKKoFbJAtzIQnqgUczh4WMXA== X-Gm-Gg: ASbGncvcDeE3v+WOwwX9tV18JE46Jube5umIpx4X/IJWrUStsiZJmCqLlaQPIfze145 W+uv7S6z7NIJKALEjl1u3QIbgfv4r4zuiyl6qSp4M4ac90I37IKA2z4tNjTJ6oS2TjPa/EtU0jR Q6cMBN2L0d9JzjedE3D+IUYi60JqWuIwRpg6obfaX2PxHUQSn8QPMhSjOblAjGdxoHPQYuxsFdV +/YNs/Y6McOwDYjHgo7SNnSu77tGYe+1XUJzQnTwz2AyQggBGY8IhPLrL676zx0/OO9ISRs0N8A pbNF6JpvaON3E8+A2cbomdbF76z6c+gJn6lKhumyqJo= X-Google-Smtp-Source: AGHT+IGq+6ZozSdyd1Y8QHtDz48sCHu1BoaODoGINXUEV2GRTo6QoM/lGJf2FFqQStu1HkdC5T/iQw== X-Received: by 2002:a05:6a00:244a:b0:736:4abf:2961 with SMTP id d2e1a72fcca58-7396109e8bamr2866625b3a.17.1743054351891; Wed, 26 Mar 2025 22:45:51 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fa4014sm13313458b3a.22.2025.03.26.22.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 22:45:49 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <07f9cc3ac1ea9ea1eefea82da3c107d9f0792a8e.1742663354.git.~@wolfsden.cz> (Tomas Volf's message of "Sat, 22 Mar 2025 18:09:07 +0100") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> <07f9cc3ac1ea9ea1eefea82da3c107d9f0792a8e.1742663354.git.~@wolfsden.cz> Date: Thu, 27 Mar 2025 14:45:34 +0900 Message-ID: <877c4bxc01.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, Tomas Volf <~@wolfsden.cz> writes: > * gnu/services/version-control.scm (gitolite-rc-file-default-enable): New > exported variable. > (gitolite-rc-file-compiler)[enable]: Use it. > > Change-Id: Ie6326ff69f3d454d96db6629dd5387757567d68f > --- > gnu/services/version-control.scm | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm > index b93cb9f590..87f134cb23 100644 > --- a/gnu/services/version-control.scm > +++ b/gnu/services/version-control.scm > @@ -65,6 +65,7 @@ (define-module (gnu services version-control) > gitolite-rc-file-roles > gitolite-rc-file-enable > gitolite-rc-file-extra-content > + gitolite-rc-file-default-enable > > gitolite-service-type > > @@ -244,6 +245,17 @@ (define* (git-http-nginx-location-configuration #:optional > ;;; Gitolite > ;;; > > +(define gitolite-rc-file-default-enable > + '("help" > + "desc" > + "info" > + "perms" > + "writable" > + "ssh-authkeys" > + "git-config" > + "daemon" > + "gitweb")) > + > (define-record-type* > gitolite-rc-file make-gitolite-rc-file > gitolite-rc-file? > @@ -263,15 +275,7 @@ (define-record-type* > (default '(("READERS" . 1) > ("WRITERS" . 1)))) > (enable gitolite-rc-file-enable > - (default '("help" > - "desc" > - "info" > - "perms" > - "writable" > - "ssh-authkeys" > - "git-config" > - "daemon" > - "gitweb"))) > + (default gitolite-rc-file-default-enable)) This field should control the values against a set of all valid values, ideally. Another ideality: this configuration should preferably use define-configuration, where instead of #f value we could have maybe-values that when unspecified are omitted entirely, leaving the application to use its own defaults. Can be made in a different series though, as that's new work I'm simply suggesting :-). -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 07/13] services: gitolite-service-type: Do not install gitolite package. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 05:48: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: Tomas Volf <~@wolfsden.cz> Cc: 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174305444025369 (code B ref 77186); Thu, 27 Mar 2025 05:48:03 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 05:47:20 +0000 Received: from localhost ([127.0.0.1]:46739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txg5H-0006az-4I for submit@debbugs.gnu.org; Thu, 27 Mar 2025 01:47:19 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:47137) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txg5E-0006ZS-2q for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 01:47:16 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22401f4d35aso13615645ad.2 for <77186@debbugs.gnu.org>; Wed, 26 Mar 2025 22:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743054429; x=1743659229; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=OxZ/1B7Na4tD/iNgmHd+r5YXeZwmEp3T0wqLROI22xU=; b=bHwaj7WMHdWaJ8okeH1KEgJVoiz5mXLqzp6v5pMUjOs57a/a0ItAvC82C8heWT+rRA /cTKimc2CkhjfxZ7K44fNYo0thQaPVcOR8a/fymjdyjQ826xcUWBjzIuY/HZkl5O5cjU JiMT5g96X8TteNKaLJSi8/c2rhxoYiFPBGkoz6GcM8K9QmaL/Zh3FOgbSaV91ihkqdfL cfh4/FwoJCUiheEg80V3LD+/klRKUZnx54rNDinv/MeIUWDIZSw9wMrWmnWw9oOZbGEb b6EtOvrt9k3gYDKFydtGX30cfV6R7NYHWUHQ/h1X8LuQtkygknFhx1irBeofUC4ZehBr 0ywQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743054429; x=1743659229; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OxZ/1B7Na4tD/iNgmHd+r5YXeZwmEp3T0wqLROI22xU=; b=tiKc21kDQUbrGOZq0VZ0uzq53+5Cj6uchyDWKpLtxYPRnIzT2ix01ONmiT0Pkmg3fK 8EF3HlndiyGEn/Wulsj/F18C8nabNoQSwx9ZzKB/6kcq19hDPMKtzXYTa7fyVUow1ZAB 4ulzox+D89/ftIAfRo3EXDQnid1YkBBMLd9ASL4PtyYk2bXf7XtCQRwjGbBSi5MDzgUk cFdQoQJtF+VZTSmdyqy9+bnxRsASqFRytfav31ArvIugsqWANR332pDk2CFBg/sI3J0D J4n717GPnYrOTz+xHcDgKrw21A4x3frvG6yW7JFshriYoQ5ipX7wf1avGtiLRKRXZZNW ptgA== X-Gm-Message-State: AOJu0Yzz3YdV+v5wf9kmx3Yr1n6Qy703Z8jPOtYEm8bfeLRVWl2o2SeU 4xNxqAMDWf9ZjLRvXq6uiYO8e27hYTUAX6euBGTZYsiUiyJ2jY8GpgP06A== X-Gm-Gg: ASbGncuHDJ1hy4uYpOfnQz0MRYRxjc0PGz6TBMLTaqOa+D5MnCLCyMzvbbVCeiabcVn bUC2xSmsPjlik4Lnmk/cKwxk9wnRd4a8kZtgEB2GnBE1XbG3bSwtwNTYTdPgrsBAd+a+1atfnHY 6CvXtwu0NHpZVE2GU6bXQ5+oiDk3A42IxPOnePsVxDKvkvKNrU244S1SpU8ti2wGj2jS1Ts5lMI PjwBcmVKuZYYR24HxZxpfiYZofCrJISgz+O7mBhYJpJvJZVzx9JEmhq52wnWKsBkOpYTS6wuLGV +03V6X+HKVbfsyVPwLakU3Grljr2VNz3Al6Dvss4tsM= X-Google-Smtp-Source: AGHT+IFGk2ysGcnOZejT8qABkQ0F3XcmO9JnHMDOPSRKNGmmHZj6xB2HX7iIiMVdVQst3VSj/cl4Mw== X-Received: by 2002:a17:902:d543:b0:220:ce37:e31f with SMTP id d9443c01a7336-228048b2899mr34580785ad.17.1743054429206; Wed, 26 Mar 2025 22:47:09 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811da38asm120352245ad.186.2025.03.26.22.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 22:47:08 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <1e8a46dfc6861ebc9552ee2ca5ee17c6f48ccf34.1742663354.git.~@wolfsden.cz> (Tomas Volf's message of "Sat, 22 Mar 2025 18:09:08 +0100") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> <1e8a46dfc6861ebc9552ee2ca5ee17c6f48ccf34.1742663354.git.~@wolfsden.cz> Date: Thu, 27 Mar 2025 14:46:52 +0900 Message-ID: <8734ezxbxv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Tomas Volf <~@wolfsden.cz> writes: > It is not ideal to pollute the path with the binaries from the gitolite > package, so adjust the package to support that and the service to no longer > install it. > > * gnu/packages/version-control.scm (make-gitolite)[arguments]<#:phases> > {'patch-scripts}: Use store file name of gitolite-shell. > * gnu/services/version-control.scm (gitolite-service-type): Drop the extension > of profile-service-type. Neat! -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 00/13] Revamp the gitolite-service-type Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 05:56: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: Tomas Volf <~@wolfsden.cz> Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174305493630501 (code B ref 77186); Thu, 27 Mar 2025 05:56:03 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 05:55:36 +0000 Received: from localhost ([127.0.0.1]:46819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txgDH-0007vt-SV for submit@debbugs.gnu.org; Thu, 27 Mar 2025 01:55:36 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:52729) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txgDF-0007uk-Ap for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 01:55:34 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-223fd89d036so13951435ad.1 for <77186@debbugs.gnu.org>; Wed, 26 Mar 2025 22:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743054927; x=1743659727; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=fuMUcvOGHhh52lATzRd23NX8b9i9xtw5H0SqxnFdxhQ=; b=QoIBflVLKfTpNcUO40ENMJaulfn/X2UMR4WNFncj/o2X4j355S9f4ZiUQAQrOgkR6g EBR6bsRnLFbtT2uBKbDFooiJJwhvzwyHBm9+NT5bac9UuwThEJT2GA4D7m6wYOX3Kccu bxOzDwmJXdnMoPy1yxnPLN8QpJLjlO6MlNxtN4/AYtO/m25ulDHT+YE+9AhYp9fE+wj6 xb4YJQEHJEYNkn35ATJTXG9KbL3Wqe9Zzz4Xv2WYm+jUP9WuQlsw+/VCR8ic/uRomwqM aZ1UY48FP2njP15go2pvu9/yMmhjKunqxQgZq/qhd99jZLsk6FSPFQqTIjNetWkEWrDV R1ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743054927; x=1743659727; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fuMUcvOGHhh52lATzRd23NX8b9i9xtw5H0SqxnFdxhQ=; b=OCBgHcK8PJuBRhUsDaIZh6oufs7/pO2eTwh/wsi/KFq2dCwykKVdzeG6q6CIGKY0H+ 00RBiY1DXVa7Ve3NKs6mfTG0VhdC7uWyTdtjML+2/KCwb/TTg7+KDINDU+BJwMiOpCeL zvNw2txZgwIoQhz6+ZxcD++ksMIR8rPn5O8osVU2SYHrfNLQKkLd6131aDjTUFcoiZ9x 6wUjnh5GVyO99QOHNoFh2qOmd8Fp2PLxHKs4yaJ1skbN5FOvoy1ICVPNyLxjkn+6pcAA SO/Qe/sq7bz6rnOCN4CuAPl8ccRpjKFG/CgHzHasWQcByW1Ly88zHg7z7uNT2zPpyyD0 br5w== X-Gm-Message-State: AOJu0YwctYqNyMvfJyU6I9Fn7fzqQnTK8EUjutt3SQRByVgnw8X3ipIw XGM1Mw0YZjc4q6ej6ue94Bbla0/QJFESmdnJ+rqPNq0hrsfO9fVArBqgRw== X-Gm-Gg: ASbGncvHBTIziBi+LBfISUTtK9HGbrHFWv9CKPbrF+mmNRUJ48MkPGVO8yD5LpzCXuw 4EdABty/JILIcCeCm7vaP06MMct92JwefyITWC7WijWTlZzANQVo8ZZcUY/oku4n+rIQGiInuoO 5Mz+bA+fFn1J6z/VCeA8IPxVnpu8+kDiWDBg4M0yyOah96kAvlw1Rriu21Jx4RZJxCrRKKFY9L2 31eEggIdI3WCwT5cR2VwX+lHoIshiPaJC9K9kw59rgBkNOQXdUNTceFKtkJiuRLDVLc6EMpPjTO BeRwlj1UEV5fNb0QF9ArkcGXEHiuekuYou87IuI/tN4= X-Google-Smtp-Source: AGHT+IHq+eBR/T6kOQeylPTPZ1NMzxuOuM+1+crb8r+x4iV/OuXxfHjX5dECBZD3AzzrXshwDPPSZg== X-Received: by 2002:a05:6a00:4fc1:b0:736:5c8e:bab8 with SMTP id d2e1a72fcca58-73960e10bdemr3464108b3a.3.1743054927047; Wed, 26 Mar 2025 22:55:27 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd613bsm13807174b3a.62.2025.03.26.22.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 22:55:25 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (Tomas Volf's message of "Sat, 22 Mar 2025 17:48:31 +0100") References: Date: Thu, 27 Mar 2025 14:55:09 +0900 Message-ID: <87v7rvvwzm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, Tomas Volf <~@wolfsden.cz> writes: > Extensions and improvements for the gitolite-service-type. > > Tomas Volf (13): > services: gitolite-rc-file-compiler: Switch to match-record. > services: gitolite-rc-file: Add log-extra field. > services: gitolite-rc-file: Add host-name field. > services: gitolite-rc-file: Add extra-content field. > services: gitolite-rc-file-compiler: Set mode of the generated file. > services: gitolite-rc-file: Export default value for enable. > services: gitolite-service-type: Do not install gitolite package. > services: gitolite-accounts: Convert to match-record. > services: gitolite-activation: Convert to match-record. > services: Add gitolite-git-configuration. > services: gitolite-git-configuration: Add default-branch field. > services: gitolite-git-configuration: Add receive-fsck-objects field. > services: gitolite-git-configuration: Add extra-content field. > > doc/guix.texi | 41 +++++ > gnu/packages/version-control.scm | 5 +- Apart from my comment w.r.t to the log-extra default value in patch 2/13, this LGTM. Could you clarify my question for said patch? Reviewed-by: Maxim Cournoyer -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 02/13] services: gitolite-rc-file: Add log-extra field. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 17:39:02 +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: Maxim Cournoyer Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174309713717456 (code B ref 77186); Thu, 27 Mar 2025 17:39:02 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 17:38:57 +0000 Received: from localhost ([127.0.0.1]:51197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txrBw-0004XU-KR for submit@debbugs.gnu.org; Thu, 27 Mar 2025 13:38:56 -0400 Received: from wolfsden.cz ([37.205.8.62]:49814) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1txrBs-0004Wz-5D for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 13:38:53 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 4994A3956DC; Thu, 27 Mar 2025 17:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743097130; bh=ugPjAnS98S56qSMNwsvUZC0OfvFiHO923xASn3y4Wrs=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=t3WSF6AP6P1AInXRLgOIRfIhVZhge/IIxnXyXxA2hgbGc6nmoXNM4lgI+EV8QFkcC QsdWnFIIHkuZQhnZvFgI94B2ltSOwr2KbLklJ1kE/8XdcVl5mrDBvO5Q0YezN+BVc6 U3XCeCcgmdZntIle4OpYBpSDGGSw7oLZKV54zC+A26bp2CsWIZt6B9W6A824x5lcd9 YE2y5P3jdZDwToRYM/XbPujx/v+IIRvY5n5/P7OEgh9a4sIioVecI7eqbJwT993BP/ 2Ome668dcNO8lAHZ/v16ZGVHQkb2ktEuGcenzypjb6++bc5EqbBmXvNIjx0/TZ5jjv 5Ip0j00ruzRnIqQ8QMF7MlIYdNIFX4ffgC7c6BfrjyTIl3mSKIrfGjK2id11bgTVGv Saf8BF3hNLzcPLNXEqEyYdO72FpPvT7NxPItPgXxH++rGqOwXZBMS6AMWhbtEfIvwk z0r8meXfEeZsFGLwyiwABihioYmu9wLcQsKMpJfcsKrANsU8NsqbHPHYjK6Wr1v6mP kSgL23KccCFtVY/7AdgXzmbTIqbVZKBs86vpnsvl7eBLqOTgg4VPr5e7oXw9dR1+sC CoPSb/nXkSgZvmeyrHz54s8Cakv0TzRqwuCyOfa+r8L7B1o++o4LyRS8MEm/tZObvr OlY1vAOIzPzqMP5VddD27Ngs= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (37-48-35-88.nat.epc.tmcz.cz [37.48.35.88]) by wolfsden.cz (Postfix) with ESMTPSA id 5E53739533D; Thu, 27 Mar 2025 17:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743097129; bh=ugPjAnS98S56qSMNwsvUZC0OfvFiHO923xASn3y4Wrs=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=HgWaZztbyCQq+VKEk3ZypjpxlFQyM2mWFkgBbQSPAbuKsP8Q6ICYTKIoXs/nnKiF9 zT0n953rrX7NV0xt7pF3NIPxPm4kzsmi1TUAG6qaHqKymVC19/cZrmO6Dk4tbMsLLq HauoZafC9v/9pnoSF7+NMFkiu1VtZ+I09lpM+XMs6bdM7+HrX6RqYCxdyulHC0/ZNt iiVSdfjjJKOgYBdk/c6TUrfg+yMRxbrwFcxmyHWzuBE5VDByVsBNn7yRCHtl17WOkr eC1V/Ud+N6iWhUwKb8kB44PtDOQScTmif1FsU6atq4+xhUFII0wrjo/YZQAOJyWW4a UuslPb8hazKHpQHFaPLzcR4TgyjLnIZGvLdH0NcE9TIHa/OXjhwGxnbQ1TiWe+rOOv 0gd0LP/Q/nS94W7hJ2R7+ffwmLcgWYf5ZV5XoNlnmyS+nRE+OXzScEOdN5KtLc0RUN yHJj7RQ/R+BrPYZ1O9NYQn/XwMNDNADYLmpGtE3lhtp8Vv7uKCpp6zhx9Fggk2wXn7 dxAtLnapCyX72ai2NHVYJAu+wsBeLBpuDCXXdrFmOCUYhYWyvsgX71qKziOTNLo94N U3q+vLlGOTghkSA/WOXu0K6/rU23N/wqdzFaeyN/H6mVRZ2jm9hYFs/uuW9hR7zecq EafflN+eoD3aH1jljRChC9Mg= From: Tomas Volf <~@wolfsden.cz> In-Reply-To: <87frizxc8g.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 27 Mar 2025 14:40:31 +0900") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> <87frizxc8g.fsf@gmail.com> Date: Thu, 27 Mar 2025 18:38:48 +0100 Message-ID: <87msd62x1z.fsf@wolfsden.cz> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Maxim Cournoyer writes: > Hi Tomas, > > Tomas Volf <~@wolfsden.cz> writes: > >> * 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. > > [...] > >> +@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). > > Since this is newly introduced, what ar ethe historical reasons given? > Shouldn't it follows the default upstream behavior and default to #t? The problem is that the upstream default is done using the following lines in the default configuration file (distributed with gitolite): --8<---------------cut here---------------start------------->8--- # comment out if you don't need all the extra detail in the logfile LOG_EXTRA => 1, --8<---------------cut here---------------end--------------->8--- Since we are generating our own configuration file from scratch, and it does not include the LOG_EXTRA line, we have already changed the behavior away from the default one, and I felt it necessary to keep it that way. Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 04/13] services: gitolite-rc-file: Add extra-content field. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 17:44: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: Maxim Cournoyer Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174309741019332 (code B ref 77186); Thu, 27 Mar 2025 17:44:05 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 17:43:30 +0000 Received: from localhost ([127.0.0.1]:51211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txrGM-00051k-5R for submit@debbugs.gnu.org; Thu, 27 Mar 2025 13:43:30 -0400 Received: from wolfsden.cz ([37.205.8.62]:58494) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1txrGJ-00051C-LE for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 13:43:28 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id E68CB3953CF; Thu, 27 Mar 2025 17:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743097405; bh=xAC7rCzgu7JkwRsiI6tGK4Yh8AemZZ/V8e6lLlDAkQM=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=F2p45sWCpCwECKp0UuYaHMmOW2ZF6uZ2K92HOzfpIm784uc9NrQoS9nRnxDnJd5gS EqjBoiQVH84/wh0r3T0pVvpq5zcp6/1F1Xk02bZwaZTG4x/BbgdSqv+LCqlrwYVznU nagzKrZ8inRahYQqPWtFDqpJiKmuvqT/L/YSzULaQ78LLmCGnDDutsSbz/5Rttsdu6 m3nZ8dns/5LIICkzQmZysCallSdR1/P+THVhGuS8cbujoMj1yk2ZxumGDsm/OItDMD W17/a1q6TCbjjxYnXDyiUN2+dUadAXVUk8m+X6BvuaWZFT6kB9JWv1of804P7RhZEN HLLie5AsJSyXgEPlzgolF3RM/Wtx3VyLTlYAdCxGNDeMtpyi+6MezT+hZs7xNrpDrr O/cHBDAXv1DgN9D70Dw5d7phzBoICWNG+UMCqe8KvqCXUyweEueixJL6xuCYOuhMve bMKXldLZukZPpUWejvEGfE0duG6g+TfMVijaRXzpXEW4gYnno+mpPG6iOwVCM3i5pj Aba8dP4NcbWWAfTaNPpSuSkt37q41yY/AU/4SfjaJ74Kl5fsnsMRhC4Nl7w/haYU/H cg3r2AGhrB4tpUiK3mDpcyzRATFcPn6V8J2cjV9r269pr6Xwi1S/+K73311mYLDJA+ saR3RExaPAWFUg9GDHz/SUIM= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (37-48-35-88.nat.epc.tmcz.cz [37.48.35.88]) by wolfsden.cz (Postfix) with ESMTPSA id 60F2839556D; Thu, 27 Mar 2025 17:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743097405; bh=xAC7rCzgu7JkwRsiI6tGK4Yh8AemZZ/V8e6lLlDAkQM=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=F2p45sWCpCwECKp0UuYaHMmOW2ZF6uZ2K92HOzfpIm784uc9NrQoS9nRnxDnJd5gS EqjBoiQVH84/wh0r3T0pVvpq5zcp6/1F1Xk02bZwaZTG4x/BbgdSqv+LCqlrwYVznU nagzKrZ8inRahYQqPWtFDqpJiKmuvqT/L/YSzULaQ78LLmCGnDDutsSbz/5Rttsdu6 m3nZ8dns/5LIICkzQmZysCallSdR1/P+THVhGuS8cbujoMj1yk2ZxumGDsm/OItDMD W17/a1q6TCbjjxYnXDyiUN2+dUadAXVUk8m+X6BvuaWZFT6kB9JWv1of804P7RhZEN HLLie5AsJSyXgEPlzgolF3RM/Wtx3VyLTlYAdCxGNDeMtpyi+6MezT+hZs7xNrpDrr O/cHBDAXv1DgN9D70Dw5d7phzBoICWNG+UMCqe8KvqCXUyweEueixJL6xuCYOuhMve bMKXldLZukZPpUWejvEGfE0duG6g+TfMVijaRXzpXEW4gYnno+mpPG6iOwVCM3i5pj Aba8dP4NcbWWAfTaNPpSuSkt37q41yY/AU/4SfjaJ74Kl5fsnsMRhC4Nl7w/haYU/H cg3r2AGhrB4tpUiK3mDpcyzRATFcPn6V8J2cjV9r269pr6Xwi1S/+K73311mYLDJA+ saR3RExaPAWFUg9GDHz/SUIM= From: Tomas Volf <~@wolfsden.cz> In-Reply-To: <87bjtnxc4w.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 27 Mar 2025 14:42:39 +0900") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> <3ae90a9c51dc9508f324eee1d32002a081d93c33.1742663354.git.~@wolfsden.cz> <87bjtnxc4w.fsf@gmail.com> Date: Thu, 27 Mar 2025 18:43:23 +0100 Message-ID: <87iknu2wuc.fsf@wolfsden.cz> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Maxim Cournoyer writes: > Hi, > > Tomas Volf <~@wolfsden.cz> writes: > >> * 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 2c7ddb2f55..e60fef9673 100644 >> --- a/doc/guix.texi >> +++ b/doc/guix.texi >> @@ -41164,6 +41164,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. > > What is the %RC hash? It is the hash containing the configuration. Gitolite's configuration file is just a piece of perl source code, in the form of: --8<---------------cut here---------------start------------->8--- %RC = ( # ------------------------------------------------------------------ # default umask gives you perms of '0700'; see the rc file docs for # how/why you might change this UMASK => 0077, # look for "git-config" in the documentation GIT_CONFIG_KEYS => '', [...] ); # ------------------------------------------------------------------------------ # per perl rules, this should be the last line in such a file: 1; --8<---------------cut here---------------end--------------->8--- So this field is verbatim added at the end of the hash, serving as an escape hatch to configure properties not yet supported by the gitolite-rc-file. I realize the description of the field requires some knowledge of how gitolite is configured, and I am open to suggestions on how to improve it, if you have any. :) Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 06/13] services: gitolite-rc-file: Export default value for enable. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 17:47:02 +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: Maxim Cournoyer Cc: 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174309762220821 (code B ref 77186); Thu, 27 Mar 2025 17:47:02 +0000 Received: (at 77186) by debbugs.gnu.org; 27 Mar 2025 17:47:02 +0000 Received: from localhost ([127.0.0.1]:51224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txrJl-0005Ph-HF for submit@debbugs.gnu.org; Thu, 27 Mar 2025 13:47:01 -0400 Received: from wolfsden.cz ([37.205.8.62]:50522) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1txrJi-0005PP-C6 for 77186@debbugs.gnu.org; Thu, 27 Mar 2025 13:46:59 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 154F0395747; Thu, 27 Mar 2025 17:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743097617; bh=/PLbHlG73lZECmkJRD1Bsi4JkRVt/nuRUYSmzewGJfs=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=e77iNsTx7QdwKW+giDcJ2Lyj7wKIyJnvVMV/ZeuY2br2WeKJwh29RuQ9Aiiii5SQx /VAueDFTFgwBPg+VkH2CBS5MxDXxljv8bLUj94jMoDiZ44+ItYwq/7fNdVDyjMfelT ZDh7Q0U1E4PQN6PEXiHlIPmeOTMXkML9Tzcf2lii67MOmNgRWZJIyxdvWMFOCOPtd6 GQkUwEDR3a3gNBejLcUg1Z2APRCTNckpJcePsdU6p4ZSbSDcmRYoyVNWo2Hx7K25pd aQXPysx7AK7/IvnKE+dNw7zY9qMdWFUWnrV/PKw/ZXDdRfJeq1llQLYfcFflWcOXYR WLsYXO/91HLRrYZEOcA0dc+NohXcNBQNNCW7t2oYnqRU5JBxB4Rtc5pEFUYWNLUEkq EPJrF203xVo9CccyWLQqwprEjExoX6IOU0vvTT413z+8Wc3bu/mP067V++Va7Rt3aU q+fshhVzT9EasG36KubZZYLj36hVwg8JWRna+7m1flzMdo6rZWuU6dg0q69Xe2TciY J0j3TRZrwGIQCYiO8nkLhaIzjySPEk27lFUfb4kVE5sxLqorslPkyGaT4QAIVnJMVq PqmqJ/A0SNGTBEkwEYvFWYhS1ayiQo5k8pZk0Voz/o24e+N7BRME5J7ArHJj+op0nq +eTrMnlkJ3rvzOraFMU7Jtvo= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (37-48-35-88.nat.epc.tmcz.cz [37.48.35.88]) by wolfsden.cz (Postfix) with ESMTPSA id F239A396091; Thu, 27 Mar 2025 17:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743097616; bh=/PLbHlG73lZECmkJRD1Bsi4JkRVt/nuRUYSmzewGJfs=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=mp1dGZFwmi+wKPKXKz5vhUmRHeFVj3FwjKh+SfJUwuNVzC0VY+Kix9vaBudh71fIg OddXF1+0mUtFa3+9E8xhjp1xMhJ81gEePlP/TAQYKCbFt+1J0q6YuGjlQPc5IYb/5Z S512rGGAO4ru38kV9a8Qx/ezSBDsGeesaJEseJ3oDXDhkpBRpaRnd6hWS63vINIhnX IW4yyzWGNcZlb2osE1U2bWsU3E1x4GGDkVj0mj5ey7cADfCCVEKg8FLtGnDmISXQWc gUkaZt/EdkxNQUEZhnOt3g5Fnn4ntRRJintVegyTIqBPG9K7Dm9vxSZp+13HfNTrEe zsbRmigqbjn2JON8fpH9edjO4AHDcRgCtIvwhBabvY0Q0S8LYT/6wzBtHCM3HeJHc6 p8hWUEc6Q1GfJtpN6e9X3jx4ZnXo6YCwzvPkxuLN/neYAPSEFba4OXg9R7KQe//0S7 exS3WbFtHVCo8l4Tbx/MEyTy+kWyPfSU8UU5s/50eiKfd+b5hBCkUuaoPbtZq6iz5x EdkxhH+mJsWSA/yt+Nddo+Bc/+iYU7lk4zegLXjLRCmC8MjiQ0xAXLmZevuXAFrLvr wtLvpemdx3/hWs4f1gRtSQjpo9Oz40067M1FulNXwuQNi9qJcyQZyoNJ8fUTpp5iqY 4sBY+dSgtmHjMURHToXLOgIk= From: Tomas Volf <~@wolfsden.cz> In-Reply-To: <877c4bxc01.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 27 Mar 2025 14:45:34 +0900") References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> <07f9cc3ac1ea9ea1eefea82da3c107d9f0792a8e.1742663354.git.~@wolfsden.cz> <877c4bxc01.fsf@gmail.com> Date: Thu, 27 Mar 2025 18:46:54 +0100 Message-ID: <87ecyi2woh.fsf@wolfsden.cz> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Maxim Cournoyer writes: > > This field should control the values against a set of all valid values, > ideally. > > Another ideality: this configuration should preferably use > define-configuration, where instead of #f value we could have > maybe-values that when unspecified are omitted entirely, leaving the > application to use its own defaults. Minor problem (as described a bit in the other email regarding log-extra) is that gitolite really does not have "defaults". Or rather, the defaults in the upstream configuration file are not the same you get when you just omit it completely. I will need to give some thought to this. > > Can be made in a different series though, as that's new work I'm simply > suggesting :-). I will add it to my todo list and hopefully get to it on day. ^_^ Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 05/14] services: gitolite-rc-file-compiler: Set mode of the generated file. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: 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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590421681 (code B ref 77186); Mon, 31 Mar 2025 22:11:03 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:10:42 +0000 Received: from localhost ([127.0.0.1]:43326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNL5-0000QR-K2 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:41 -0400 Received: from wolfsden.cz ([37.205.8.62]:40972) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL2-0000Pc-CS for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:37 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 615FD379D96; Mon, 31 Mar 2025 22:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459035; bh=iYP/tg5Wo3JM/MIR/iUMpzzyvBPWlYgEU+9C+NCI4wY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sw7LH5RYYlwpcc0DPVPBAM6xFb5gFDuAjBszo8ut321tseXcCQ/l+Kr9GaA7ci6Du 0prLbKMAbpgobUQlgG5neyZABpPuwuyTtTpXaDHCNKXC9lK0jl+Ag1I8eJGSsrxCYb w8U5STNkhl3CF56kpcJ0EPR4VgYtoinroXLJIueFisfP7MWdYByPGd7VSVlswmxWzF euFvrYihM01EfuAM1JUwqoIUT3Z4NRbcuv2HR8br8+YUloV7+n2cZg0HBEdmshiIGZ 3Py6HyR7Faoz/pvj5LgtCDqgP6nWJO3sWauR5nOWr81OsvAlyexC9CMG2vQ6ZR5Q4F LnPe9K4X+wGHs2Co0MqUxrDGcF0L6IDc3huysxn0LpxnrZoHWE/szcdH91GDamePYz PdlPc7qGC8E2eOfG4cQ908BWlxT9Aqy/hhWUS/RnMNhiw/hJBcvL1rBKgTnKM/LIDZ YqAGTJK9B9GCOxjv7seQrSSDrbhJKNdJQ5Aarm5M5ZxWt5BC4PUXWQHaSwnCQGeJCE TAEIddFrnGIwyCOEnbJL+FiDzYuGjNLhvyy8HN5Kalkq5kI+RBfIXTE/ypdWMfP4aJ xcj3qopi3eCdYrimuR0VqL/P213DxKKAwz+TY1Wv/Gm6ZYwiH2iXkjlwDTr4e6gcjb cKJMPw26CcXZMZ6dkv0/L6Ps= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1A426378276; Mon, 31 Mar 2025 22:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459035; bh=iYP/tg5Wo3JM/MIR/iUMpzzyvBPWlYgEU+9C+NCI4wY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sw7LH5RYYlwpcc0DPVPBAM6xFb5gFDuAjBszo8ut321tseXcCQ/l+Kr9GaA7ci6Du 0prLbKMAbpgobUQlgG5neyZABpPuwuyTtTpXaDHCNKXC9lK0jl+Ag1I8eJGSsrxCYb w8U5STNkhl3CF56kpcJ0EPR4VgYtoinroXLJIueFisfP7MWdYByPGd7VSVlswmxWzF euFvrYihM01EfuAM1JUwqoIUT3Z4NRbcuv2HR8br8+YUloV7+n2cZg0HBEdmshiIGZ 3Py6HyR7Faoz/pvj5LgtCDqgP6nWJO3sWauR5nOWr81OsvAlyexC9CMG2vQ6ZR5Q4F LnPe9K4X+wGHs2Co0MqUxrDGcF0L6IDc3huysxn0LpxnrZoHWE/szcdH91GDamePYz PdlPc7qGC8E2eOfG4cQ908BWlxT9Aqy/hhWUS/RnMNhiw/hJBcvL1rBKgTnKM/LIDZ YqAGTJK9B9GCOxjv7seQrSSDrbhJKNdJQ5Aarm5M5ZxWt5BC4PUXWQHaSwnCQGeJCE TAEIddFrnGIwyCOEnbJL+FiDzYuGjNLhvyy8HN5Kalkq5kI+RBfIXTE/ypdWMfP4aJ xcj3qopi3eCdYrimuR0VqL/P213DxKKAwz+TY1Wv/Gm6ZYwiH2iXkjlwDTr4e6gcjb cKJMPw26CcXZMZ6dkv0/L6Ps= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:11 +0200 Message-ID: <94a18d62c14f5b6bc8f6c06d4af598a5feafd4fd.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) Copied over from the official configuration file, this sets a correct major mode when you visit the generated file. * gnu/services/version-control.scm (gitolite-rc-file-compiler): Add local variables. Change-Id: I8a9d794a1e3c7049ae606165cf939d81b5dbdf6e --- gnu/services/version-control.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 9bd17334fe..b93cb9f590 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -311,7 +311,11 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if unsafe-pattern (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") "") - "1;\n")))) + "1;\n" + "# Local variables:\n" + "# mode: perl\n" + "# End:\n" + "# vim: set syn=perl:\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 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= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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) -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 01/14] services: gitolite-rc-file-compiler: Switch to match-record. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 22:12:02 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590681929 (code B ref 77186); Mon, 31 Mar 2025 22:12:02 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:08 +0000 Received: from localhost ([127.0.0.1]:43348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLX-0000Ux-F0 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:08 -0400 Received: from wolfsden.cz ([37.205.8.62]:47516) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL2-0000Pa-1I for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:39 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 805B93790C0; 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=fTVYanPx0JV3Pmcrc+mNFWmdr13hjxPtyMzTgEqUqPY=; h=From:To:Cc:Subject:Date; b=sPBxtD8TQ56EVX6pqgltgAsmCb3DknVGjySqgga6r2po5Q0QBT4/DL88mC7U6T4qi xHt6G5pVlMFnSw/rS/Q/BE08p5a0txqUmWNuHgw6PXNIQA43QYbFEl0+Xk67HbMfic wAtsvS3CU4cYWezrE120iaLXK52J3/tKH18A4vAN/PHSRUPkviA9mj1ScyA/5uPoaf 9j3GIYIB9b+8WJVK8WaaxdhVFC6oe0SQZEeAhAMbjiAZ9Hm/6E6bitkDkI/GQ5VwGz YQ47DMFnM2BahN62183m/2vkvGywxFTsh5gpd0d+XA8OTlZv9qopnPx3lRzoIcz1hl oa14RLxBPT+fDGH1EI4UKM3QUYwtJ6TJ8ddr3BqqH23pMLPrIfvDOeca8lhL4eFwhq zznt3RCRkyvtdRTT70o73Bzeh4AcpyVYcWuKA3HS3QropYuJv1JiuLupeiD5xf9CQu rHMgWqPCdGWIImj3jnnW6hKtGMa0sAURUxqQoiW9v5INP08AICebsu+HqfL+sA/SfX WwQFedEgZrTvRJZQaVDeq+QKD2ULDYxTgSvc8wmVeOQrTuadJwpZ+MRe80zC5eCPlU 7jwkdTFy5ezOdQzl+93vtWPeaywLt1jYoD5a/Dhmc6vbGU2A1vtT7RSqAAyGLLlIlH ZPE2RbSy56Ryfo/QricCftkQ= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 101F6379527; 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=fTVYanPx0JV3Pmcrc+mNFWmdr13hjxPtyMzTgEqUqPY=; h=From:To:Cc:Subject:Date; b=sPBxtD8TQ56EVX6pqgltgAsmCb3DknVGjySqgga6r2po5Q0QBT4/DL88mC7U6T4qi xHt6G5pVlMFnSw/rS/Q/BE08p5a0txqUmWNuHgw6PXNIQA43QYbFEl0+Xk67HbMfic wAtsvS3CU4cYWezrE120iaLXK52J3/tKH18A4vAN/PHSRUPkviA9mj1ScyA/5uPoaf 9j3GIYIB9b+8WJVK8WaaxdhVFC6oe0SQZEeAhAMbjiAZ9Hm/6E6bitkDkI/GQ5VwGz YQ47DMFnM2BahN62183m/2vkvGywxFTsh5gpd0d+XA8OTlZv9qopnPx3lRzoIcz1hl oa14RLxBPT+fDGH1EI4UKM3QUYwtJ6TJ8ddr3BqqH23pMLPrIfvDOeca8lhL4eFwhq zznt3RCRkyvtdRTT70o73Bzeh4AcpyVYcWuKA3HS3QropYuJv1JiuLupeiD5xf9CQu rHMgWqPCdGWIImj3jnnW6hKtGMa0sAURUxqQoiW9v5INP08AICebsu+HqfL+sA/SfX WwQFedEgZrTvRJZQaVDeq+QKD2ULDYxTgSvc8wmVeOQrTuadJwpZ+MRe80zC5eCPlU 7jwkdTFy5ezOdQzl+93vtWPeaywLt1jYoD5a/Dhmc6vbGU2A1vtT7RSqAAyGLLlIlH ZPE2RbSy56Ryfo/QricCftkQ= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:07 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-rc-file-compiler): Use match-record instead of match with $. Change-Id: Ia2f4985e921aee5f8859d1858f7c186b707d7a36 --- gnu/services/version-control.scm | 55 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 06b6ff224d..f5558e9197 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -267,33 +268,33 @@ (define-record-type* (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) - (match file - (($ umask local-code unsafe-pattern git-config-keys roles enable) - (apply text-file* "gitolite.rc" - `("%RC = (\n" - " UMASK => " ,(format #f "~4,'0o" umask) ",\n" - " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" - ,(if local-code - (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) - "") - " ROLES => {\n" - ,@(map (match-lambda - ((role . value) - (simple-format #f " ~A => ~A,\n" role value))) - roles) - " },\n" - "\n" - " ENABLE => [\n" - ,@(map (lambda (value) - (simple-format #f " '~A',\n" value)) - enable) - " ],\n" - ");\n" - "\n" - ,(if unsafe-pattern - (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") - "") - "1;\n"))))) + (match-record file + (umask local-code unsafe-pattern git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + ,(if local-code + (simple-format #f " LOCAL_CODE => \"~A\",\n" local-code) + "") + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + ,(if unsafe-pattern + (string-append "$UNSAFE_PATT = qr(" unsafe-pattern ");") + "") + "1;\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 06/14] services: gitolite-rc-file: Export default value for enable. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 22:12: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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590681935 (code B ref 77186); Mon, 31 Mar 2025 22:12:03 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:08 +0000 Received: from localhost ([127.0.0.1]:43350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLY-0000V4-8t for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:08 -0400 Received: from wolfsden.cz ([37.205.8.62]:40976) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL2-0000Pj-Uc for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:39 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id EBDB1378CE3; Mon, 31 Mar 2025 22:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459035; bh=Cal+nuQshd8REsd6ki2mc86Aw/Yl+BGNDRvB/mfBH30=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rqgSJ+PRswU1wUNEg7MH+VoKsZ3mTqeIbBWFs2gyLgUj0wE3dZ+BEEfi3LKzBoU/M SdDATCg7TI2Hw3jzvSuNPQrOzww9pZpy0yAapZjm7k5DX/Sp7WNPphKCbLbtt2J4mK x0Sgq7w54NX2lb4sRVUikuy6GLTcxkp9FDQsWV73/BPtGay/mXbeJWNmgyagQ1W3K5 7nvYvkzv2/zt78bURNcaIGwugeT+Yjl0JH3QMZMx3tqn5UK4BUFvaPVTVzoRpKsEad GYiJTD2VweJxvVVte0wItnHrlpfFnG+XYBVxlgcryJTwgDasddGKKAUJFaouHHPxSp 7RT233bpqv+SUUNHMbMe+7F9h3za0GbEsEVWpnm6jnmHsfpP6wSSUz6+pnZFiuucRV XHu+Ns75G3WTnTaKm4xom99y4hGqn9t4xDy7mVQ9v1/FM4yIS63pUVex/9CqYkVJQT kU/YK1seektZUZ/HWGz3HpoVIJBnw5JCZpICdeWDV35dPXc8FcXDDDyBSqghoCcUep BluKTBTO9Haz8Y6qYbNoKUB0pj21hB+XPtZ3blhmB9cvHXjCQ5U/MpGZc0lh38rPF6 aQno+b6O1pvIfQLg5z2XsLLjouwDMgSTs8LTS82iSvJ8Q7FtE9aMcbZkDvVAkMJPl4 4fsIYR7Ux2vSowRRFiiw68aQ= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 90E26378277; Mon, 31 Mar 2025 22:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459035; bh=Cal+nuQshd8REsd6ki2mc86Aw/Yl+BGNDRvB/mfBH30=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rqgSJ+PRswU1wUNEg7MH+VoKsZ3mTqeIbBWFs2gyLgUj0wE3dZ+BEEfi3LKzBoU/M SdDATCg7TI2Hw3jzvSuNPQrOzww9pZpy0yAapZjm7k5DX/Sp7WNPphKCbLbtt2J4mK x0Sgq7w54NX2lb4sRVUikuy6GLTcxkp9FDQsWV73/BPtGay/mXbeJWNmgyagQ1W3K5 7nvYvkzv2/zt78bURNcaIGwugeT+Yjl0JH3QMZMx3tqn5UK4BUFvaPVTVzoRpKsEad GYiJTD2VweJxvVVte0wItnHrlpfFnG+XYBVxlgcryJTwgDasddGKKAUJFaouHHPxSp 7RT233bpqv+SUUNHMbMe+7F9h3za0GbEsEVWpnm6jnmHsfpP6wSSUz6+pnZFiuucRV XHu+Ns75G3WTnTaKm4xom99y4hGqn9t4xDy7mVQ9v1/FM4yIS63pUVex/9CqYkVJQT kU/YK1seektZUZ/HWGz3HpoVIJBnw5JCZpICdeWDV35dPXc8FcXDDDyBSqghoCcUep BluKTBTO9Haz8Y6qYbNoKUB0pj21hB+XPtZ3blhmB9cvHXjCQ5U/MpGZc0lh38rPF6 aQno+b6O1pvIfQLg5z2XsLLjouwDMgSTs8LTS82iSvJ8Q7FtE9aMcbZkDvVAkMJPl4 4fsIYR7Ux2vSowRRFiiw68aQ= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:12 +0200 Message-ID: <03525ec2ac1e2602638091a0bf8cd26b283cffed.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-rc-file-default-enable): New exported variable. (gitolite-rc-file-compiler)[enable]: Use it. Change-Id: Ie6326ff69f3d454d96db6629dd5387757567d68f --- gnu/services/version-control.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index b93cb9f590..87f134cb23 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -65,6 +65,7 @@ (define-module (gnu services version-control) gitolite-rc-file-roles gitolite-rc-file-enable gitolite-rc-file-extra-content + gitolite-rc-file-default-enable gitolite-service-type @@ -244,6 +245,17 @@ (define* (git-http-nginx-location-configuration #:optional ;;; Gitolite ;;; +(define gitolite-rc-file-default-enable + '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")) + (define-record-type* gitolite-rc-file make-gitolite-rc-file gitolite-rc-file? @@ -263,15 +275,7 @@ (define-record-type* (default '(("READERS" . 1) ("WRITERS" . 1)))) (enable gitolite-rc-file-enable - (default '("help" - "desc" - "info" - "perms" - "writable" - "ssh-authkeys" - "git-config" - "daemon" - "gitweb"))) + (default gitolite-rc-file-default-enable)) (extra-content gitolite-rc-extra-content (default ""))) -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 03/14] services: gitolite-rc-file: Add host-name 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: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.17434590691944 (code B ref 77186); Mon, 31 Mar 2025 22:12:03 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:09 +0000 Received: from localhost ([127.0.0.1]:43352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLY-0000VG-UM for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:09 -0400 Received: from wolfsden.cz ([37.205.8.62]:40966) 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-0000Pb-V9 for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:40 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8C7BD37A300; 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=1OYRyBIMiaChjSf8obNH/+pN3f7ws+Md4nKVC7nSwRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Nnt4SogLJ3I0FqkfSB2ybtvwQcbmKijJiuox2zZUOR7MQ57ewJn+9YvPzpe5tJHot 7eGBdP0FzYc1Tqs3+x2iUkvwIBueyyY79O8Lr1nfpCaFRKKrMtCI4qx5UILHY5omHd jkV46b1De8XsyR+3EQuhXlBlPmoo9rwksmKo+gpd9UDsSaS8f5xbJzrkjPYHhLfb0Y b2ZG5R0L73j5bVIvNLhtja65tQZkpCH7U/ig4VyeB6pTsOwaMYJF89zZJEPlcgfGX0 kwCvQfMtpw0/BSQYwZY+t39mE54LLbPSE+ctROguwUlwLJtTdjmKctRzOFdUZc1gG0 M5cc/XAWp+BSBfEgPyNfCyZufML6Mt93LV8/h6K3FAzq/pvOnApXs4VrANhgcIUcTe 5yl18XvWRHUJ+YKTHdlfLljTiWwbHgB/1Q77az9Ckls+NtbdJHgst89NReXuMBBv76 bMXfJ2dl5ZLHSes2tlWoJh0zZmE+aMtHPZjk0uikjYjHxBcvF30N7uKvTJg8v3uyD9 mwjoxFU2rIzGrjCoQUOVjIX59G/iGoI2ThXQUdM25akRFp/BdaQlAh7CiYviBKDNQU oLHGyEMDsCVuSw4MLcDZeqLDl/RCDNzyHBHV0M4J2w+h2/JozgMbu5u9tItLiCZ/xc mxR7f3QobDmTCyiCiM5o/Qd0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1C223379C98; 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=1OYRyBIMiaChjSf8obNH/+pN3f7ws+Md4nKVC7nSwRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Nnt4SogLJ3I0FqkfSB2ybtvwQcbmKijJiuox2zZUOR7MQ57ewJn+9YvPzpe5tJHot 7eGBdP0FzYc1Tqs3+x2iUkvwIBueyyY79O8Lr1nfpCaFRKKrMtCI4qx5UILHY5omHd jkV46b1De8XsyR+3EQuhXlBlPmoo9rwksmKo+gpd9UDsSaS8f5xbJzrkjPYHhLfb0Y b2ZG5R0L73j5bVIvNLhtja65tQZkpCH7U/ig4VyeB6pTsOwaMYJF89zZJEPlcgfGX0 kwCvQfMtpw0/BSQYwZY+t39mE54LLbPSE+ctROguwUlwLJtTdjmKctRzOFdUZc1gG0 M5cc/XAWp+BSBfEgPyNfCyZufML6Mt93LV8/h6K3FAzq/pvOnApXs4VrANhgcIUcTe 5yl18XvWRHUJ+YKTHdlfLljTiWwbHgB/1Q77az9Ckls+NtbdJHgst89NReXuMBBv76 bMXfJ2dl5ZLHSes2tlWoJh0zZmE+aMtHPZjk0uikjYjHxBcvF30N7uKvTJg8v3uyD9 mwjoxFU2rIzGrjCoQUOVjIX59G/iGoI2ThXQUdM25akRFp/BdaQlAh7CiYviBKDNQU oLHGyEMDsCVuSw4MLcDZeqLDl/RCDNzyHBHV0M4J2w+h2/JozgMbu5u9tItLiCZ/xc mxR7f3QobDmTCyiCiM5o/Qd0= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:09 +0200 Message-ID: <8448afc0beb49af7e4ba750a000d82d7c8dd5af7.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add host-name field. (gitolite-rc-file-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: I1231ed47a294ff48b35a301f76ae8e9cbfcd9b95 --- doc/guix.texi | 4 ++++ gnu/services/version-control.scm | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index bc8e7206d5..4daeab924b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41068,6 +41068,10 @@ Version Control Services value from gitolite however is @code{1} (written as @code{#t} in this configuration). +@item @code{host-name} (default: @code{#f}) +The host name of this gitolite instance. It is used by the mirroring +feature. + @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 344538a73e..2b99e8db86 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -61,6 +61,7 @@ (define-module (gnu services version-control) gitolite-rc-file-unsafe-pattern gitolite-rc-file-git-config-keys gitolite-rc-file-log-extra + gitolite-rc-file-host-name gitolite-rc-file-roles gitolite-rc-file-enable @@ -255,6 +256,8 @@ (define-record-type* (default "")) (log-extra gitolite-rc-file-log-extra (default #f)) + (host-name gitolite-rc-file-host-name + (default #f)) (roles gitolite-rc-file-roles (default '(("READERS" . 1) ("WRITERS" . 1)))) @@ -273,7 +276,7 @@ (define-gexp-compiler (gitolite-rc-file-compiler (file ) system target) (match-record file ( umask local-code unsafe-pattern git-config-keys log-extra - roles enable) + host-name roles enable) (apply text-file* "gitolite.rc" `("%RC = (\n" " UMASK => " ,(format #f "~4,'0o" umask) ",\n" @@ -284,6 +287,9 @@ (define-gexp-compiler (gitolite-rc-file-compiler ,(if log-extra " LOG_EXTRA => 1,\n" "") + ,(if host-name + (simple-format #f " HOSTNAME => \"~A\",\n" host-name) + "") " ROLES => {\n" ,@(map (match-lambda ((role . value) -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 08/14] services: gitolite-accounts: Convert to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 22:12:04 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590691950 (code B ref 77186); Mon, 31 Mar 2025 22:12:04 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:09 +0000 Received: from localhost ([127.0.0.1]:43354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLZ-0000VJ-HB for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:09 -0400 Received: from wolfsden.cz ([37.205.8.62]:40992) 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-0000Q6-FW for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:39 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id DAD68378E71; 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=7g3NNXuAA8e/geoTZ1904GyvrdcsoGc1vUC8NzYtPp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wkKiTyDn5J+8FlF8Qh3nW8WTdRSyL0eReIlOFPRib7MYEdkvVt+j3t50CcBymDUCG n8NPlbA+EWGhyHIABo6zk6t/Ns8i0vOKfOf1ZKNH99LgnAiPcPCLE2wmdlHyAvntGC YXXhZphZcib9l4NWoumZy6c+XYhhfpHO8JVC3SLMyp450IdXqV3nyoGyuRptx3+nL6 4cRpTz5eV2mpt0x0D+52AbGlDmUFFPUvKOzUBcegUnEQL5h1blOP0OAM4Y+QNDjZXi XIjxEFw2Xc0U5kSNMb1z/quIjh/iOoi1w61V3birzhYOcYd/DzP4/CrI8LuXB7qqbu x3hFawJgBAHxNk2Q1c2kWaQlObzfGawqSWVuOCLEMBe6QjmSYY6fX5k5kb+/OIpt2Q Y3dPh/T706c2xuH8hiC9VBz9D+ng8zZyGfDxHpXxeULJgCDxpgmxP8ba2rd8u6xTb2 D1WUq+MiRuEkhnJhe8nir30bM2W7Mwujo4pRGEwezi+LYF/2Qijw3X4rZZlUETOl8o SSK24+VjWrL29wwBBki7yTTi4JDtwAfaVQcrj4F/8w4dNFfV2AeCYgAnrXXMsXxL4b X+BD8uTmhWVA9NbHgJPMalxee0LHl7iKKFiPaPFgsjsP9wG5/xiowp+1pa989ViSCI KH09E5YdNzScxqF1dcXF09CI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8CBFD31D177; 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=7g3NNXuAA8e/geoTZ1904GyvrdcsoGc1vUC8NzYtPp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wkKiTyDn5J+8FlF8Qh3nW8WTdRSyL0eReIlOFPRib7MYEdkvVt+j3t50CcBymDUCG n8NPlbA+EWGhyHIABo6zk6t/Ns8i0vOKfOf1ZKNH99LgnAiPcPCLE2wmdlHyAvntGC YXXhZphZcib9l4NWoumZy6c+XYhhfpHO8JVC3SLMyp450IdXqV3nyoGyuRptx3+nL6 4cRpTz5eV2mpt0x0D+52AbGlDmUFFPUvKOzUBcegUnEQL5h1blOP0OAM4Y+QNDjZXi XIjxEFw2Xc0U5kSNMb1z/quIjh/iOoi1w61V3birzhYOcYd/DzP4/CrI8LuXB7qqbu x3hFawJgBAHxNk2Q1c2kWaQlObzfGawqSWVuOCLEMBe6QjmSYY6fX5k5kb+/OIpt2Q Y3dPh/T706c2xuH8hiC9VBz9D+ng8zZyGfDxHpXxeULJgCDxpgmxP8ba2rd8u6xTb2 D1WUq+MiRuEkhnJhe8nir30bM2W7Mwujo4pRGEwezi+LYF/2Qijw3X4rZZlUETOl8o SSK24+VjWrL29wwBBki7yTTi4JDtwAfaVQcrj4F/8w4dNFfV2AeCYgAnrXXMsXxL4b X+BD8uTmhWVA9NbHgJPMalxee0LHl7iKKFiPaPFgsjsP9wG5/xiowp+1pa989ViSCI KH09E5YdNzScxqF1dcXF09CI= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:14 +0200 Message-ID: <70c55db7895094248d5200d85a7c8bd38d255588.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-accounts): Use match-record instead of match-lambda with $. Change-Id: I37e3018513a8f20eeed8614dff46a63b8d7c2883 --- gnu/services/version-control.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index e39bb509c2..07984d309e 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -336,18 +336,19 @@ (define-record-type* (default (gitolite-rc-file))) (admin-pubkey gitolite-configuration-admin-pubkey)) -(define gitolite-accounts - (match-lambda - (($ package user group home-directory - rc-file admin-pubkey) - ;; User group and account to run Gitolite. - (list (user-group (name group) (system? #t)) - (user-account - (name user) - (group group) - (system? #t) - (comment "Gitolite user") - (home-directory home-directory)))))) +(define (gitolite-accounts config) + (match-record config + (user group home-directory) + ;; User group and account to run Gitolite. + (list (user-group + (name group) + (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory))))) (define gitolite-activation (match-lambda -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 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= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 12/14] services: gitolite-git-configuration: Add receive-fsck-objects 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.17434590701966 (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]:43358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLa-0000Vb-AG for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:10 -0400 Received: from wolfsden.cz ([37.205.8.62]:41016) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL6-0000Qc-S3 for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:42 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 1804E31D178; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=F+HqRt7oaZcJSFSsRYlekahZxKXt8LaLsv57/D8uaPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=J8HmQDkP844aG2tMtRhxfP9Ei+3Bg0kZrB9jN0znkt4vnxlmsEeO8MWRpq0DDuVD9 mNSKyW2OAL9sPU8fJqj8BDr5FxRmc7AtXv0YmlWUnzzMhU+/vAVKRA2a1m+3ttJZMO Bvs41+59asjqFjTqmZOtkZ4sQL8lPXkuLiqASFXb60QZWk+a2zdiKDiJkO4lM2anGT L+uDBxKOm0AzssKZ4o6Lyiw19wm1PaCcD/BRZzWiFC6PaUeg9uZMppxduCVZU5PWD2 rK2108LZgZOfI+nKorGIpNee98amXvb5BC7go8yK0eZ/lGTtL2/lsO/P9rzYFw8Wdg ehURHkWsMNtJTk6ad9T8JYxyHcpewfNrFyzaoFoTC/F6in64tTEMkbGRD3FzWemvA4 JiazRaIoRFi37nU6E9U5uTOwRRvkYjbb5/97D5voNjY7mgCH/rbCnbJOcCxOakZiMV 42Gr7R2Xzoo/FNLigUMoQnA5Ks779bIp51bVEMCNH5quEi2CA6BkNTl5kUGBKU1bLf 5Tb6VTKQhtkEcAueWNwUkdsaVuYNfmfIhier7gzmoakVwKc0+Z+sBKjngQItBjPYTT 0UcNReGHtbHikE/UkZB2z5RuVaLve3RTAjHYrvejq57Xxu8DUysIqRg/74oDsVqoH6 31WZLEqL+K+5WyCdfU1kkP9w= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 919ED378FC5; Mon, 31 Mar 2025 22:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459038; bh=F+HqRt7oaZcJSFSsRYlekahZxKXt8LaLsv57/D8uaPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dojzs1fKFCdDBvxwYoBLHLlFhswadvsHyj5tfF5o59wf9HvMJuNcvsxkS2y64vXRE nxWga+9lNRDAGIcWR4VJNfrLgkeCjjMESt2/6meMWZrCFu6rp735f50jLJRTKtJv4z S4NeYZXnSANpMJWM3VEcrRCSGrBbFK3Wu5VH86g7rkT0z4Vdmi+VVteWY3uYW+Ywmv oTtVkvH7ICNy+HSxA59Idjf+q9cpnNPU++QosmAe7fxg0+FHbFsUiSd9NH78os1kH1 48zegDbS1Mcbb6DShVRcgT13fUvlE5ScERYv4uIxhVxgC2mHKghJtZ2uiB3ufl85Kq DcGFWWLIFMctRCCz7tP3ZK7mSoTW3v934wZPvNhwltOGEUMRexlw14Dv/XmkqyhKKZ id8tzF8Onqc/qkIVtI3JaVV2JMOukHNy/K8Mrb7l9UGC1osuzD2Nr8cEVdRu8BTyKi 6+az2Yt3uTK+ZFUkrV8A8bEghBNx8jAYqmBJA7UI6D40d8Qh8+IMCji4mDRsFZGD2f zYJ8H63teDqCIe9zaFwlfOI5FW7aB8bm/BvbIFzcCxM8/C/Nup7KKDzWOFXqkzt9VG N1s1HZ9q7pjp0OEZSzVSjCs5Dw5FwPqcPZTTnpb/UzbLou/Gfali8g99ewvJ8G2aXq Y1kDY70F0vRtUWBqOuV6vVes= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:18 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add receive-fsck-objects field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 08a9c44e5b..fec6457c08 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41103,6 +41103,9 @@ Version Control Services If true, set the @code{init.defaultBranch} option to that value. Common values are @code{"master"} and @code{"main"}. +@item @code{receive-fsck-objects} (default: @code{#f}) +If it is set to true, git-receive-pack will check all received objects. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 12653b3cea..1e21174ea9 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -73,6 +73,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-name gitolite-git-configuration-email gitolite-git-configuration-default-branch + gitolite-git-configuration-receive-fsck-objects gitolite-service-type @@ -331,17 +332,19 @@ (define-gexp-compiler (gitolite-rc-file-compiler (define-record-type* gitolite-git-configuration make-gitolite-git-configuration gitolite-git-configuration? - (name gitolite-git-configuration-name - (default "GNU Guix")) - (email gitolite-git-configuration-email - (default "guix@localhost")) - (default-branch gitolite-git-configuration-default-branch - (default #f))) + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost")) + (default-branch gitolite-git-configuration-default-branch + (default #f)) + (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects + (default #f))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch) + (name email default-branch receive-fsck-objects) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -349,6 +352,10 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if default-branch `("[init]\n" "defaultBranch = " ,default-branch "\n") + '()) + ,@(if receive-fsck-objects + `("[receive]\n" + "fsckObjects = true\n") '()))))) (define-record-type* -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 10/14] services: Add gitolite-git-configuration. 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:06 +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.17434590711980 (code B ref 77186); Mon, 31 Mar 2025 22:12:06 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:11 +0000 Received: from localhost ([127.0.0.1]:43360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLa-0000Vk-Oz for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:11 -0400 Received: from wolfsden.cz ([37.205.8.62]:41026) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL6-0000Qg-SJ for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:42 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 2ABB63797AE; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=C1ECZHbntLpyLkeSMm9EOukAKZn52GuxAZ9fkT3KszQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=chcq5wOJNH4IrtQKEDGxsVtWxpjbO7ONIGALISPLLMiQrK6zXxEd4FLp8M1CKCduu 0C1jmpAAMXYEE4HoOUdT+7UBgha4EepTcelK52pvTayxYGhvpzRMJXMCuX7FANwpDQ 6lUjTszOGZdZ4tQr4RnPAIR2b3Ey9EUBae+jaQeUmwPNGkqVmAIDrqNzJlBcedqpe/ 4Yf0gHblI52ikButp2bJM1MuEDc+8yERjg9hGFbHfZ7vl+G+Iv4+iF088g46l5B0bj 77U0+alEbaSFIljSamFGS1xTLZzogtHB9vgwym2ZMZ09TH/+XMaYqGPCUDIuv9AdmD py97yBPwx16Vc8gVGckS8mHVRBel+pGZUjFD9s2jGJPThnCvM3J/5JTxvkju502eCI 0zzi+/elpltn6vntO1JQPi6jsNQaW9OluVwFm9AO5vJak+VfvbEOMW9Bo6rtsFt9Jy 4TK3Zvqc5qLOQ66CsZ47ZNL0FspTXb1dQTzohcgfQSAG8x4DWCbJ8URq4BAoVisz3y K8ZI06QmGJrfv9hK1T3eEj3UPFp2Pkt5+6468qKxy2Kiov2Yfi0WeLv0S63F7nsI+K 7n8098V1fzrkHFu62jb9+eaXLlT7L2yWhBtoU6btzxoPjHBJM0HNviTG8YgNfIZ/nU Yc6RbCvCwm3TDA6J7SCyiCzY= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8B492379999; Mon, 31 Mar 2025 22:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459037; bh=C1ECZHbntLpyLkeSMm9EOukAKZn52GuxAZ9fkT3KszQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Flrul6WwYLC1YiMXOHlySNSWX4XQTtQikW2eHSxOOMSeVIn2R3pR8HARfJN6AcW8s Z2KhWZlKUz7kn1Fn+0YlcUboSSMsPz26+Z0k9Xekm7sC2Q55QRT4GZ0UQCcvejrlcf 1o5yL3iu3jvEltYVowPBAkPRvmLO2QNtIzC02wQrMmA8t2THqPTH3yvObENG0Hjxir 2wP7lKPGf+ltno3SAU5NyObx54Nhp9o/kyTsH88uJDcgINZeDLoma1tg3CsQLNq4qE lI6wlmSoB/YKt7RyjviD5qSeVBydaK2TAD4gYQjHxOzA41rU3blaOmT1EYGNBPs28D 8Cbuz/1Rhcn8XTM8kJC39L0NnR3dme7hRlU+GaBNISS7R5voJohuNEWxGlNW0eRpia XNoufrMLa28jIJHUCYNk7SaArqGtiFPrwJFO7dc397V9d3BabzxLr1ienCO53Tz3d/ aQ66y+EutPhSbMS98c3z7osqHzKG6xnmHgSptugj2qLAwkf/lDrPoS140cB42mkLu+ ItmUVmbA2zLHjqgYZqxSmEbzwdDllYDhlSu7DloAFOXEwgIaXshTNDg3pNtSneWnJU WUHejcYfzrMsQ05jz1UbbQSLNJugUMJ2yrqyPwSOkngmHo8JHAWaMdwQ/64b58kdCX 4I1e+W84Hs/vbfpOIwlDudlg= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:16 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) In preparation for further customizability of the git configuration, extract the current setup into a separate record type. * gnu/services/version-control.scm (): New record type. (gitolite-git-configuration-compiler): And gexp compiler for it. (): Add git-config field. (gitolite-activation): Use it. * doc/guix.texi (Version Control Services): Document both. Change-Id: I7658698a93f938f62f41a4fa45b72de1eeb14414 --- doc/guix.texi | 17 +++++++++++++++ gnu/services/version-control.scm | 37 ++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 299f84bb49..f2f9827cc0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41009,6 +41009,10 @@ Version Control Services A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite. +@item @code{git-config} (default: @code{(gitolite-git-configuration)}) +A ``file-like'' object (@pxref{G-Expressions, file-like objects}), +representing the git configuration for Gitolite. + @item @code{admin-pubkey} (default: @code{#f}) A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite. This will be inserted in to the @file{keydir} directory @@ -41084,6 +41088,19 @@ Version Control Services @end table @end deftp +@deftp {Data Type} gitolite-git-configuration +Data type representing the git configuration file for gitolite. + +@table @asis +@item @code{name} (default: @code{"GNU GNU"}) +User name used for commits (e.g. during setting up the admin +repository). + +@item @code{email} (default: @code{"guix@@localhost"}) +Email used for commits (e.g. during setting up the admin repository). + +@end table +@end deftp @subsubheading Gitile Service diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 268b0a47ee..dcdddf8078 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -67,6 +67,12 @@ (define-module (gnu services version-control) gitolite-rc-file-extra-content gitolite-rc-file-default-enable + + gitolite-git-configuration + gitolite-git-configuration? + gitolite-git-configuration-name + gitolite-git-configuration-email + gitolite-service-type gitile-configuration @@ -321,6 +327,23 @@ (define-gexp-compiler (gitolite-rc-file-compiler "# End:\n" "# vim: set syn=perl:\n")))) +(define-record-type* + gitolite-git-configuration make-gitolite-git-configuration + gitolite-git-configuration? + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost"))) + +(define-gexp-compiler (gitolite-git-configuration-compiler + (config ) system target) + (match-record config + (name email) + (apply text-file* "gitconfig" + `("[user]\n" + "name = " ,name "\n" + "email = " ,email "\n")))) + (define-record-type* gitolite-configuration make-gitolite-configuration gitolite-configuration? @@ -334,6 +357,8 @@ (define-record-type* (default "/var/lib/gitolite")) (rc-file gitolite-configuration-rc-file (default (gitolite-rc-file))) + (git-config gitolite-configuration-git-config + (default (gitolite-git-configuration))) (admin-pubkey gitolite-configuration-admin-pubkey)) (define (gitolite-accounts config) @@ -352,7 +377,8 @@ (define (gitolite-accounts config) (define (gitolite-activation config) (match-record config - (package user group home-directory rc-file admin-pubkey) + ( package user group home-directory rc-file admin-pubkey + git-config) #~(begin (use-modules (ice-9 match) (guix build utils)) @@ -390,12 +416,9 @@ (define (gitolite-activation config) ;; Set the git configuration, to avoid gitolite trying to use ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home-directory "/.gitconfig") - (lambda () - (display "[user] - name = GNU Guix - email = guix@localhost -"))) + (copy-file #$git-config + #$(string-append home-directory "/.gitconfig")) + ;; Run Gitolite setup, as this updates the hooks and include the ;; admin pubkey if specified. The admin pubkey is required for ;; initial setup, and will replace the previous key if run after -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 07/14] services: gitolite-service-type: Do not install gitolite package. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 22:12:06 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590721991 (code B ref 77186); Mon, 31 Mar 2025 22:12:06 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:12 +0000 Received: from localhost ([127.0.0.1]:43362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLb-0000Vs-Ez for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:12 -0400 Received: from wolfsden.cz ([37.205.8.62]:40996) 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-0000QD-KP for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:42 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6030A379998; Mon, 31 Mar 2025 22:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459037; bh=3XtKA9Zrv2uss1fHbAHSt5eNszKPTc1NgYkzhICxV9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ki/odJ6vslLev3nIGv/XklweMFb5LE/T6p0cyX/a2onhRQ0M08bKClMGB61LrSAxd cRFVZEvSoxzSQpVqdcEeUvxZ5rLXvSwSTLfrPwDCUadGRL5d6MQooSP9//FUbinmJo //NUYklV59T6d8j431bmpwyTlASgMfjXYFORLAk0QEY8Qm8RiuFV5tMB9ASsDXuN/m LsMmZjpdRjNOUI72JXprSCDbaNbQFxwll/p+isG6PMVLv3nd7ECZHBD+6nfoctFA3R l4IJKwa2eVEkHAtOn4BJ4v9yvXPTp7Fwb8i8KNFyqSoIOPFKzeakaA89PEgEMwS/FW fZUuBB6aHlZguU7nf32K2lUtMijvXpyswAeorG4j0Jd9Hw0ilkkuNH2M6zNyvdZzKG ZTS5tIa85qn6Kn9uNg0m9QeSTVgXch1MARD0VuA4Nrf+J9CjCfQAYrvGTB0FeSWqoK WBrQCOFKhr4YIPTQV/nhHbFIPAHUzEwnrUMbe3TTf0sMxn+Nr8/gQMYtrvesduEE+f 3xw15Gx+bCqPL7QY2oBj5bmkiPToZsb8y1nyLjLBpF1NgLE+jNDGPjuknYmHo2WMX6 kGHmKw4yV/FjqJfFj3EJEtnrYeqZdKMQN/kxbe9bjt3aqbR7fteI5d+G+kG6nFRn8F eeqkjl411MP0vCGxUorCnU/4= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 15046378FC4; 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=3XtKA9Zrv2uss1fHbAHSt5eNszKPTc1NgYkzhICxV9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KFLct0FUbCvMprac/COpMZpUoe3onm1XbTa3EkxEQO0COLF0NWgtuqwIeKmDhwsot 48FgDxUW5PEhSX+B1bUi5XjCFfW2FC3UfTFmZR5a/j0C1bY+Zep/HbYwKsrYXeviI1 n9ikD/3SaFiWENM987ELosMq4XscWkKdWqw4hcSfIJgr66DPf6vyeoyrmXGmD3lPl6 XU0W0Rxa5OIgP3wGnHXfIxFMp0MEOjJ/DW9h8igX+pdWzlXAElsvFYu5vFpr/nyYeC 3loxoYQdbfQElwyF0WwWb3VjnmYQBnGNoFbpEodKKg/BQoY7mnltnmQ748gHuebon2 SBHucR+U+X93/Pedji3IDkQsxWj/c26ujy+OzO4G/McknJyMKoeTBJgmxG++KC1uT4 6W/8VLISEC9Ah3e83CsEMvucHVWZb8w8ovsr/rScvmPHh6BSKiQnakPItkRcgsAvmM GbJ3TV3O26P4+N5cozBifITw1m3m03TeGxZ6CV/y1ESH0SixzGD4nbab7W1WLQUvZg ZsPG3MDzmhdjUVrB481iq87712id3LaxLyumRb6HBpiXfO+ZNlxcLtlV0O09hRcLCy irNLlOQgPdAFZWKVBd1wmMKEMYeC5O4vpQYF959InJefphSajq0s90WtdJpS2JJUUq zl+mizGmrjTcgj4H/8fPFi8M= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:13 +0200 Message-ID: <8031b4bf4c723a6811f87e3ffc0df14651fa557d.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) It is not ideal to pollute the path with the binaries from the gitolite package, so adjust the package to support that and the service to no longer install it. * gnu/packages/version-control.scm (make-gitolite)[arguments]<#:phases> {'patch-scripts}: Use store file name of gitolite-shell. * gnu/services/version-control.scm (gitolite-service-type): Drop the extension of profile-service-type. Change-Id: I25459ccd80bda892b6d188b2b6fa99baee339cba --- gnu/packages/version-control.scm | 6 +++--- gnu/services/version-control.scm | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8f244e0fa..cd624d3d57 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2025 Artyom V. Poptsov ;;; Copyright © 2025 Dariqq +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2365,11 +2366,10 @@ (define* (make-gitolite #:optional (extra-inputs '())) (string-append " " (search-input-file inputs "bin/grep") " "))) - ;; Avoid references to the store in authorized_keys. - ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") - "gitolite-shell $user")))) + (string-append + #$output "/bin/gitolite-shell $user"))))) (add-before 'install 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; Gitolite uses cat to test the readability of the diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 87f134cb23..e39bb509c2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -429,15 +429,7 @@ (define gitolite-service-type (list (service-extension activation-service-type gitolite-activation) (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) + gitolite-accounts))) (description "Set up @command{gitolite}, a Git hosting tool providing access over SSH. By default, the @code{git} user is used, but this is configurable. -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 09/14] services: gitolite-activation: Convert to match-record. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 22:12:07 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.17434590732003 (code B ref 77186); Mon, 31 Mar 2025 22:12:07 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:13 +0000 Received: from localhost ([127.0.0.1]:43364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLc-0000W4-DO for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:13 -0400 Received: from wolfsden.cz ([37.205.8.62]:41012) 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-0000QG-MY for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:43 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9DD173790C5; Mon, 31 Mar 2025 22:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459037; bh=x0X4pCp/3Eg6dRiy6Qj1MFkTqm9nVFRUjKlK1sO8Rj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wkD51yuURdoVjAoNT4DFHgVMoOM5GpK5yJNXG2ZWc+eQ6QhtEBouTxHF8VeEnrOk8 qhc3183mUni1Q0Q7wop5qQ+uqAsauCZXjW4LX+72f6aINlGddreSkSRlZj5+jODJG+ EviNXyKb0BzAhaiH8W89Ga1o7wnZs5mSPpxGmQPk33/R1DcwII6XNgvqMvDGmdRVFj hOkpkEDGcRWYy4RsHiatnYQQLYGW5dlnp5tXD4C2TV4pjvrPUCdsyEiGrRzu9jvFup tBP0adRakHsXMM6pqqDrmuFPLXAbUIKFD4y+SO9H5PVTnMXM4qvUU5k8FoY5VAsjNl IfGs4fRX8TIkCPUeayUtMFaq0Ya9ouCrpdpJNVGVtCPS6u2FmbUoK+aUylMbfL/wO3 pWY/RXSytBvFZhW8bclLiiITJswXbm0uIBL95swRjflUtm0zJXKoeG0D347Hti6efE lEWSpjxJBI97VCSihUcnVWEiJ7F9ZJ6YR7fuGTL9MgsQwyNfhS4p1LDmaaTiSNtNo9 5BPZEQzwp7JRzsjHWPDUMDHIhr7wR3TKrqn/pp3UznKxLcvC3W/jp9dmjI+62oF4Wt fa2bWWBYq9noF89uH1JTcI4zVHPtD6xWlj5xmDWonXrMeLR2k3RKiMkpUdjNr5/c2x Boh2PyouUZ/q2LGmZgv97Nrc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 0E7143788CD; Mon, 31 Mar 2025 22:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459037; bh=x0X4pCp/3Eg6dRiy6Qj1MFkTqm9nVFRUjKlK1sO8Rj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wkD51yuURdoVjAoNT4DFHgVMoOM5GpK5yJNXG2ZWc+eQ6QhtEBouTxHF8VeEnrOk8 qhc3183mUni1Q0Q7wop5qQ+uqAsauCZXjW4LX+72f6aINlGddreSkSRlZj5+jODJG+ EviNXyKb0BzAhaiH8W89Ga1o7wnZs5mSPpxGmQPk33/R1DcwII6XNgvqMvDGmdRVFj hOkpkEDGcRWYy4RsHiatnYQQLYGW5dlnp5tXD4C2TV4pjvrPUCdsyEiGrRzu9jvFup tBP0adRakHsXMM6pqqDrmuFPLXAbUIKFD4y+SO9H5PVTnMXM4qvUU5k8FoY5VAsjNl IfGs4fRX8TIkCPUeayUtMFaq0Ya9ouCrpdpJNVGVtCPS6u2FmbUoK+aUylMbfL/wO3 pWY/RXSytBvFZhW8bclLiiITJswXbm0uIBL95swRjflUtm0zJXKoeG0D347Hti6efE lEWSpjxJBI97VCSihUcnVWEiJ7F9ZJ6YR7fuGTL9MgsQwyNfhS4p1LDmaaTiSNtNo9 5BPZEQzwp7JRzsjHWPDUMDHIhr7wR3TKrqn/pp3UznKxLcvC3W/jp9dmjI+62oF4Wt fa2bWWBYq9noF89uH1JTcI4zVHPtD6xWlj5xmDWonXrMeLR2k3RKiMkpUdjNr5/c2x Boh2PyouUZ/q2LGmZgv97Nrc= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:15 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (gitolite-activation): Use match-record instead of match-lambda with $. Change-Id: I37e3018513a8f20eeed8614dff46a63b8d7c2883 --- gnu/services/version-control.scm | 123 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 07984d309e..268b0a47ee 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -350,78 +350,77 @@ (define (gitolite-accounts config) (comment "Gitolite user") (home-directory home-directory))))) -(define gitolite-activation - (match-lambda - (($ package user group home - rc-file admin-pubkey) - #~(begin - (use-modules (ice-9 match) - (guix build utils)) +(define (gitolite-activation config) + (match-record config + (package user group home-directory rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) - (let* ((user-info (getpwnam #$user)) - (admin-pubkey #$admin-pubkey) - (pubkey-file (string-append - #$home "/" - (basename - (strip-store-file-name admin-pubkey)))) - (rc-file #$(string-append home "/.gitolite.rc"))) + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home-directory "/" + (basename + (strip-store-file-name admin-pubkey)))) + (rc-file #$(string-append home-directory "/.gitolite.rc"))) - ;; activate-users+groups in (gnu build activation) sets the - ;; permission flags of home directories to #o700 and mentions that - ;; services needing looser permissions should chmod it during - ;; service activation. We also want the git group to be able to - ;; read from the gitolite home directory, so a chmod'ing we will - ;; go! - (chmod #$home #o750) + ;; activate-users+groups in (gnu build activation) sets the + ;; permission flags of home directories to #o700 and mentions that + ;; services needing looser permissions should chmod it during + ;; service activation. We also want the git group to be able to + ;; read from the gitolite home directory, so a chmod'ing we will + ;; go! + (chmod #$home-directory #o750) - (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) - (copy-file #$rc-file rc-file) - ;; ensure gitolite's user can read the configuration - (chown rc-file - (passwd:uid user-info) - (passwd:gid user-info)) + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file rc-file) + ;; ensure gitolite's user can read the configuration + (chown rc-file + (passwd:uid user-info) + (passwd:gid user-info)) - ;; The key must be writable, so copy it from the store - (copy-file admin-pubkey pubkey-file) + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) - (chmod pubkey-file #o500) - (chown pubkey-file - (passwd:uid user-info) - (passwd:gid user-info)) + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) - ;; Set the git configuration, to avoid gitolite trying to use - ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home "/.gitconfig") - (lambda () - (display "[user] + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home-directory "/.gitconfig") + (lambda () + (display "[user] name = GNU Guix email = guix@localhost "))) - ;; Run Gitolite setup, as this updates the hooks and include the - ;; admin pubkey if specified. The admin pubkey is required for - ;; initial setup, and will replace the previous key if run after - ;; initial setup - (match (primitive-fork) - (0 - ;; Exit with a non-zero status code if an exception is thrown. - (dynamic-wind - (const #t) - (lambda () - (setenv "HOME" (passwd:dir user-info)) - (setenv "USER" #$user) - (setgid (passwd:gid user-info)) - (setuid (passwd:uid user-info)) - (primitive-exit - (system* #$(file-append package "/bin/gitolite") - "setup" - "-m" "gitolite setup by GNU Guix" - "-pk" pubkey-file))) - (lambda () - (primitive-exit 1)))) - (pid (waitpid pid))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) - (when (file-exists? pubkey-file) - (delete-file pubkey-file))))))) + (when (file-exists? pubkey-file) + (delete-file pubkey-file)))))) (define gitolite-service-type (service-type -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 11/14] services: gitolite-git-configuration: Add default-branch 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:08 +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.17434590742011 (code B ref 77186); Mon, 31 Mar 2025 22:12:08 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:14 +0000 Received: from localhost ([127.0.0.1]:43366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLd-0000WF-Ew for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:14 -0400 Received: from wolfsden.cz ([37.205.8.62]:41030) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL7-0000Qu-CG for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 5D976378EE1; Mon, 31 Mar 2025 22:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459040; bh=ajEwY7oFBemxxkb0brWc/OUaSmBJWi9P6i8uUiJ14lE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bylAzNYj+cEiIZjowz0uWbpQSi6xnP3aTYlDn1JS4vuuFGtjPG8E35RyyTngo0yiE L8kkGHAit+1iMGzk8wqw+dHJRmc712y+ecmo8igF3dYJZy3unDXXVuYyGNSvig1rhL OxdRDJuHoRafij8nJsOulvoeAATTU3MvN3VckDZtSfdaUIn0Q5RU+sayIteKCztrkp C3EDCiJKjRF7Cfqh2bztWOLX/GQDm7eyWt1TQTHXJpfE5s86hvJfCM8uTM8Nu8Ylzm J0u0f5wcNNMJIzRrMqg3JK2tnbPdzINygiJE8A6APDHEDE34vokmQhH0UI8s3DoQWR QpVJ2F9aGLlCk3z7XWPMhh2UKGjLNCNX4bRsfAF8bqE5MBjuIE8s+TRVt1I/PeeWwY S02lgGdJG3D9o/0fkbvB5ubTtcZrJK+jsHGXXsKFce8pQUvdMKL8l2GEHZ92sRt6OE 1rkQmO04945AiAkIcT+MO4xVb4R7L3dHrGljD0qoHAyU+74HKTpCmn/UkmNxFT/61L a64cA6HC6jLo6fhXo8WMyRs1CwisZw8zUBlDCb8IUTV6BJ/VhDvvDUnZ/61pJl420E kI61q5ZW1rAObJ4WNrm6rNVBhdpbn+EDU9MiP3mfbGCDezCIdQFjgMQYyd44fSB13T Yb68BsQJ5q/+vxh5H0ahLJVE= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 1445B3789FB; Mon, 31 Mar 2025 22:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459038; bh=ajEwY7oFBemxxkb0brWc/OUaSmBJWi9P6i8uUiJ14lE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ugg+YPwQiyr/72eiW+h2m7J8dGLgZc7svMeSv56XgsIWmJSYJfv9GfxNXbIfnTKmP WhZ6yR6yOzsCCpQ046RpAi7H8m3tMs8lOiQcTJhVdVQaUCuU+FhbYlyALDwfZADlwW HLGT/pKwSLZam2R+DsdVIY+W853OEXfRTvNbKSSWhtHM1oLtq4rkQJ80U9Jrc1TusA 6MKvNN3NAJmA2E5q+4c/hQBkd1Z0ps8SO4jbK7aodEOtA63OeGCgBvckGLeVofkNzN BH7jFUlDOMoSZIOkxvlJ342uwaHK5QfyZLJfV7rk4QV7r33pbqqsFSrE8mKDsuurLc 3pDs3VqgPBLtkr1Anji5xIeEg1pO0w9Z3b41v76en6dhTrzXSXYS1xc28eaGtCV/47 v3u5GTfyCl09yhawm/31sEBORKmkb4J0e0IhN/2e+S4Qwxee3hMEk5JbNtSa4LUTKc AVdDRCWvI8Wcl7o4FLc2bojXLavqXsT6otU/UWzz0Wr6D0Q6q5gsmdoIcI6WABMKWD wW/BlhXA+WQqEOxHb/WDfWGZczz49+s3Re+TZFPCx6zW34Sy6YxWgT7B6+PJxrk3aT wrLaydWwY+IRY4OEzymfZL6hBg1y0qgFe5+KIOdBdmCgq87dz1RbXTAdNUyfyA0iJL mJ++zRAsMA4RsGgsJLe/ReFE= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:17 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add default-branch field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 4 ++++ gnu/services/version-control.scm | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f2f9827cc0..08a9c44e5b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41099,6 +41099,10 @@ Version Control Services @item @code{email} (default: @code{"guix@@localhost"}) Email used for commits (e.g. during setting up the admin repository). +@item @code{default-branch} (default: @code{#f}) +If true, set the @code{init.defaultBranch} option to that value. Common +values are @code{"master"} and @code{"main"}. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index dcdddf8078..12653b3cea 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -72,6 +72,7 @@ (define-module (gnu services version-control) gitolite-git-configuration? gitolite-git-configuration-name gitolite-git-configuration-email + gitolite-git-configuration-default-branch gitolite-service-type @@ -330,19 +331,25 @@ (define-gexp-compiler (gitolite-rc-file-compiler (define-record-type* gitolite-git-configuration make-gitolite-git-configuration gitolite-git-configuration? - (name gitolite-git-configuration-name - (default "GNU Guix")) - (email gitolite-git-configuration-email - (default "guix@localhost"))) + (name gitolite-git-configuration-name + (default "GNU Guix")) + (email gitolite-git-configuration-email + (default "guix@localhost")) + (default-branch gitolite-git-configuration-default-branch + (default #f))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email) + (name email default-branch) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" - "email = " ,email "\n")))) + "email = " ,email "\n" + ,@(if default-branch + `("[init]\n" + "defaultBranch = " ,default-branch "\n") + '()))))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 14/14] services: gitolite-service-type: Allow setting the admin name. 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:08 +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.17434590752024 (code B ref 77186); Mon, 31 Mar 2025 22:12:08 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:15 +0000 Received: from localhost ([127.0.0.1]:43368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLe-0000WQ-40 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:14 -0400 Received: from wolfsden.cz ([37.205.8.62]:41044) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL8-0000R3-Tc for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id D8C9C37983B; Mon, 31 Mar 2025 22:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459041; bh=VWxynkrVb+7ZmSr2fvYfxZuI5nys7anYqcUuVgVojdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HbEXpZzJNxy5unyleNo6lslQCD9IqAtf+Bi7gRlcOkaGwtcfvX7t5FQqw8+cLrkrB Dy6+jB8TPsqC8RPRuSQau6NXvtNkvQCMmZnjZuoOW4tGb7NpyT2T4+WYjM254zxzD/ 2wNKn1yvTi/ZHdksmk3XTjYFgvkC1Za/2yhEuEusQB7RwQE572JtIBFm8orLesaBeA qC2wtQUWG/5rxnGXtEWv7JbYy+pblsj+lYAtcIfY0g+4GelxJcZ+X6Gy+hnMJ6v4UX LCBG8JZIUCDpu8WPbCeIb8KWOiNKFC39o7bObt3XiMlLvljB4e6WoVDWNi2E8OyXam w2YqzQ5yaJ03j7d26NQK3kFOl7PHIySnze75OP4lITJ4ccEUMvyUCcVOJUBp90tTAD sXzu2HrNZ0oL/hwXmPVdZbAFbRwd4y06HeOMESnl/l2KyoHO/6xyh7a28ElQU9TZZZ Y7/CYWmayw4rLPg6x/BzcaHhh3Mk3IV2Sf9fT/CJIHu51gUbs93M701a5OAtcxOiiL E3rldmSusYi4fRrAgplU87U03BsjgdkJr62JXNXwTvDcm4n7vnXsUzI9KMTl7ValIp R5BVhcdwKjMumyohczBTLPnEfk+PrNJOdIajCtrV5N6i2ajEwzmQGzsTexpxJOwujQ +4Ue2Zqcc6YnD5cKLhXNBrwk= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id A1E1137973A; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=VWxynkrVb+7ZmSr2fvYfxZuI5nys7anYqcUuVgVojdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d3cJihNX/sr68o/u56avFwMGK2QtmYrnwn5uxcfM3DfhVUJpCSLrMV0YSszQgDBR0 u2cT0WTIEc9ktGPauw20WDHMRDXbdZf/5GdiHV8iN6btcBBUsUvBnyB1BFNIhC/kR/ gvRUr1JFXh98EpcVLQWl1nzwUe6OCygfjEOWKEdKAibR+BHM1cDU3ZXURAiPxgFZJb x5dr6mLHl+1ZN3mni6GBgsEIXdVkoGBhg3455rcj27GOYp8zv7PMIJ60VBtIM6VMBl ws9I0l61T+fSQXZ3hUaoEnJtg65c+EejFT2/zlAceTfurO4nsLt/tgdTPmqhaxD+6V JY4iribtSxQofqdisUMBmRszKpO71UfhF5jYvoOccMK82gDRbCj6QvHwYWet5lI2hW uJFPUn6gla3ZpdtVXTc+DWhJmcP6P627folALhg7gf2XjsqdDMD55fc0+U53qW3PXn 4133xYE62bwshCE4sKqyPn9PlMc/5VZQo5W+T43dYGZzYCy2Yg0HkEHBKpr+4cuv2Z UnfGczzQpukrXYP4usnYJ4V09k2D5IP5RKB/bPXM/09QKKiFcdnSuJh4ADlYLQSDf6 x6stlv/pbe+2dW5InzYZFLF12+US3HX1wRKt4lFGo9Pk4iTtJU+hTi8jMQTqsaHaYm TWOYQNVFSp6/EpMiWz3M0MqE= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:20 +0200 Message-ID: <10ec1b1b255fb295438974862d806a2a19ed9754.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add admin-name field. (gitolite-activation): Use it. * doc/guix.texi (Version Control Services): Document it. Remove the wrong default value of admin-pubkey. State the need for .pub extension. Change-Id: Idadf4b2697cee6d1da10e6ba03bdc2e1d729c417 --- doc/guix.texi | 9 ++++++++- gnu/services/version-control.scm | 17 +++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ad4a623916..5db6f28f7d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41013,7 +41013,7 @@ Version Control Services A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the git configuration for Gitolite. -@item @code{admin-pubkey} (default: @code{#f}) +@item @code{admin-pubkey} A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite. This will be inserted in to the @file{keydir} directory within the gitolite-admin repository. @@ -41024,6 +41024,13 @@ Version Control Services (plain-file "yourname.pub" "ssh-rsa AAAA... guix@@example.com") @end lisp +The file has to have @file{.pub} extension. + +@item @code{admin-name} (default: @code{#f}) +Usually the key name is derived by taking a base name of the +@code{admin-pubkey}. The resulting file name is the name of the +gitolite user. You can use this field to override the automatic name. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index e73e77e0b2..51da1c59cb 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -53,6 +53,7 @@ (define-module (gnu services version-control) gitolite-configuration-user gitolite-configuration-rc-file gitolite-configuration-admin-pubkey + gitolite-configuration-admin-name gitolite-rc-file @@ -377,7 +378,9 @@ (define-record-type* (default (gitolite-rc-file))) (git-config gitolite-configuration-git-config (default (gitolite-git-configuration))) - (admin-pubkey gitolite-configuration-admin-pubkey)) + (admin-pubkey gitolite-configuration-admin-pubkey) + (admin-name gitolite-configuration-admin-name + (default #f))) (define (gitolite-accounts config) (match-record config @@ -396,17 +399,19 @@ (define (gitolite-accounts config) (define (gitolite-activation config) (match-record config ( package user group home-directory rc-file admin-pubkey - git-config) + admin-name git-config) #~(begin (use-modules (ice-9 match) (guix build utils)) (let* ((user-info (getpwnam #$user)) (admin-pubkey #$admin-pubkey) - (pubkey-file (string-append - #$home-directory "/" - (basename - (strip-store-file-name admin-pubkey)))) + (pubkey-file (if #$admin-name + (string-append #$admin-name ".pub") + (string-append + #$home-directory "/" + (basename + (strip-store-file-name admin-pubkey))))) (rc-file #$(string-append home-directory "/.gitolite.rc"))) ;; activate-users+groups in (gnu build activation) sets the -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 13/14] services: gitolite-git-configuration: 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:09 +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.17434590752033 (code B ref 77186); Mon, 31 Mar 2025 22:12:09 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:15 +0000 Received: from localhost ([127.0.0.1]:43370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLe-0000Wb-UM for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:15 -0400 Received: from wolfsden.cz ([37.205.8.62]:41028) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL9-0000Qi-SX for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 86E963792AE; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=xwelrJMlNep8GA3BZRuJ9A4bM5DICLkvr87FUKA5kWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eEJc/AJCI1+KY9zAaXRhEXMtn3OwkSQKaJEmBivd4ALfOx/S4jUDB9bwtzLmuzGqI DCdIR6ES4/lAtTAvg3DI9cP0tCwfXrxr3fmeA4CtetxgGgw2vWexawvIkpEAZ0ifdX 1adC4kTzuilLM77MWTzd+uH9dXOt0edsAoJWG+GyaLtI0NUl0/ayTnNxG2WgUR7nGD LjgCdGGtcp7xDQPgMWMIxZlDV3u18hBcdio6JRIL0waxKeU8wTIHLPboxAIIBpFdXf 6LA0xef5pZhVvDTJxAZLR5vbfKNi9IK/sElVaXAevUZ7lgc707ZJ+CoOoHI8TvEvoP A5u6v01ZK7CrQm7B3MUaeB7PwVmDPfXBdTiWmYvAFALLp/qqJxxSsn4Svs4DVgP7+/ bHtTlD7BWUTnq53jwD/qqLQBEu26KTT9d7cBQcWaU2NqaLi3/jEa00+5qPnlt2QYzK UVo7ACgH6vH8rGEgumSnKvzvHiiVwAItGuklnC0XsNN+s2jT/WYU1/mAdC3pbNG89T G6H28z/Yf+TmcsvSMDLUmv26FCbYRIm47p+B2Z0Us8iVaV7RFzZfxIGZGOKzDrBQL4 vhfyIS6f5epYnIcg35U8tLXcrni/1igcR12Mq2sbAbp7ivr09501/koSpD6pcv0mis NTZ47novT1MCh5Mk1diCI72Q= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 242013796A8; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=xwelrJMlNep8GA3BZRuJ9A4bM5DICLkvr87FUKA5kWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eEJc/AJCI1+KY9zAaXRhEXMtn3OwkSQKaJEmBivd4ALfOx/S4jUDB9bwtzLmuzGqI DCdIR6ES4/lAtTAvg3DI9cP0tCwfXrxr3fmeA4CtetxgGgw2vWexawvIkpEAZ0ifdX 1adC4kTzuilLM77MWTzd+uH9dXOt0edsAoJWG+GyaLtI0NUl0/ayTnNxG2WgUR7nGD LjgCdGGtcp7xDQPgMWMIxZlDV3u18hBcdio6JRIL0waxKeU8wTIHLPboxAIIBpFdXf 6LA0xef5pZhVvDTJxAZLR5vbfKNi9IK/sElVaXAevUZ7lgc707ZJ+CoOoHI8TvEvoP A5u6v01ZK7CrQm7B3MUaeB7PwVmDPfXBdTiWmYvAFALLp/qqJxxSsn4Svs4DVgP7+/ bHtTlD7BWUTnq53jwD/qqLQBEu26KTT9d7cBQcWaU2NqaLi3/jEa00+5qPnlt2QYzK UVo7ACgH6vH8rGEgumSnKvzvHiiVwAItGuklnC0XsNN+s2jT/WYU1/mAdC3pbNG89T G6H28z/Yf+TmcsvSMDLUmv26FCbYRIm47p+B2Z0Us8iVaV7RFzZfxIGZGOKzDrBQL4 vhfyIS6f5epYnIcg35U8tLXcrni/1igcR12Mq2sbAbp7ivr09501/koSpD6pcv0mis NTZ47novT1MCh5Mk1diCI72Q= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:19 +0200 Message-ID: <358fa9172eda0124f7da41af8810f710f9a85eef.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/services/version-control.scm (): Add extra-content field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index fec6457c08..ad4a623916 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41106,6 +41106,9 @@ Version Control Services @item @code{receive-fsck-objects} (default: @code{#f}) If it is set to true, git-receive-pack will check all received objects. +@item @code{extra-content} (default: @code{""}) +Extra content to add verbatim into the git configuration file. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 1e21174ea9..e73e77e0b2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -74,6 +74,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-email gitolite-git-configuration-default-branch gitolite-git-configuration-receive-fsck-objects + gitolite-git-configuration-extra-content gitolite-service-type @@ -339,12 +340,14 @@ (define-record-type* (default-branch gitolite-git-configuration-default-branch (default #f)) (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects - (default #f))) + (default #f)) + (extra-content gitolite-git-configuration-extra-content + (default ""))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch receive-fsck-objects) + (name email default-branch receive-fsck-objects extra-content) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -356,7 +359,8 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if receive-fsck-objects `("[receive]\n" "fsckObjects = true\n") - '()))))) + '()) + ,extra-content "\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration -- 2.49.0 From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 12/14] services: gitolite-git-configuration: Add receive-fsck-objects field. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Apr 2025 12:27:01 +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: Tomas Volf <~@wolfsden.cz> Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174368318428099 (code B ref 77186); Thu, 03 Apr 2025 12:27:01 +0000 Received: (at 77186) by debbugs.gnu.org; 3 Apr 2025 12:26:24 +0000 Received: from localhost ([127.0.0.1]:33197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0JeJ-0007J8-Jf for submit@debbugs.gnu.org; Thu, 03 Apr 2025 08:26:23 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:52335) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0JeG-0007Iu-Ed for 77186@debbugs.gnu.org; Thu, 03 Apr 2025 08:26:21 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7c3bf231660so82910685a.0 for <77186@debbugs.gnu.org>; Thu, 03 Apr 2025 05:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743683175; x=1744287975; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=j1VllFhhFAMNOL5sMUN+At0Xy9i/RwveK7zQV7cRWU0=; b=TCw13DeJc1Jb7waziOvqNCuTIy8dwlUaNucuzqzPEKIv7GlrTr+lA3NuKEpqPTXD65 5v+a2mOvRr9js73I9wjZvFfHwIX5sxsvrkHCHkUFCHbfA/NErDx56l9S9WFQgg1g2V+X KOi5fcN7+K9unWt71YBEbSREshivZYmx+i5jvcUXPqtmviVP1ogpJEj+KeLOxYFlCdNV 3LOjbYm3qXM3XvaYFEKYg4PTAlVRxA6uKOvSRpYdPKXtozVXqTe6c+8zxcYPfoJXyP2c quoqOVGDY8u9VVv54e5hLCyZq3wTWQYhW7/UVUGq4w5GCYFdbPvCPn88ugJtu56w3mqD wOvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743683175; x=1744287975; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=j1VllFhhFAMNOL5sMUN+At0Xy9i/RwveK7zQV7cRWU0=; b=SHdkPJs4hhVoh+2nQTea9jN69LgIUIye1GNcpzghS1TzNvZ9hCizdxDr4gEVUFuILz cGsMdXE1a//+h8z/72Gw2qtmqbgfsiIwe60L1K2XuEyEPZvdPGbB61lTkXK5sc3lOTiB D1ARWfoRjsfvgy21+kZZ5quIEXq7foyq3LKx6sIdqTePdN050HkuXDhrxbun5c4q29nE evjUVkYE9+RHftJ9h2FlwXHUSBaYPsfKjjhbplmzy9vG7g12D42TvidDRBIvGc7xw+UX fA5YjRj29N8UK38JzmwO8muL5Obl3ItwaQ5RIk29G68e2RAqvMM6UmRxD1iVMekyTUup UksA== X-Gm-Message-State: AOJu0Ywu58395P3I9ScbZTYQ6sUor7oyZWRAr7TC1lvn7QiSDAKoRmY1 OfWHnaGKy+YYZ8dpRTTSmtYSpa6/es/MSph9uZJJCtQ5VMzUnF4CnPwvPku7 X-Gm-Gg: ASbGnctb0swLXMhrc1FHTTc79dBPZAUMQ8LrI8YsBS4QaORczyb4ZN22LmKWHiWvkmi hHW/Ug6qvk7afGMfH7atGi4xcaOpmjuWr2SAPoLTFcKkjkQah60eAkT06jq+PH0fN43HORoeU7C 1W8cM7kLiPFOfjcP4SOKIACNaghj4wBLVtzN7vyW0cWu9tpBG7QV+v3MFamjUYYCRkBfpR9pYzE 3oxqSH2sAbmKZHy9BtomQZlT84dQl1LRzaMGHY1elmDQbhI+q/nQjN69gMZD/kInvWAtgjRcx54 au2P09Iq7A09Wjr+C/2FgejzohIFdmDOYB38F61E5PV6hgk2fQwgekAsq0p442wqQA== X-Google-Smtp-Source: AGHT+IF+2buIqEm93l2zfbKlOyrnpz3W2AReSrvlRwWcSJwfEtSSFuUOl/8a5SFUOqTrhpoiishpyg== X-Received: by 2002:a05:6214:19cd:b0:6e8:9dc9:1c03 with SMTP id 6a1803df08f44-6ef0dc517c1mr40043316d6.21.1743683174726; Thu, 03 Apr 2025 05:26:14 -0700 (PDT) Received: from terra (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4791b0876easm6936931cf.34.2025.04.03.05.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 05:26:14 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (Tomas Volf's message of "Tue, 1 Apr 2025 00:10:18 +0200") References: Date: Thu, 03 Apr 2025 21:25:56 +0900 Message-ID: <87cydtzb1n.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, Tomas Volf <~@wolfsden.cz> writes: [...] > + ,@(if receive-fsck-objects > + `("[receive]\n" > + "fsckObjects = true\n") > '()))))) > > (define-record-type* Longer term, this won't scale too well to have a flat list of options that are to go into various sections. Perhaps something like what I'm proposing for ngircd-configuration in bug#77396 would be nicer. Not blocking merging this on that though, just suggesting for future directions. Perhaps this could also mitigate slow constructor performance as you've found in a 800+ fields record. -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 14/14] services: gitolite-service-type: Allow setting the admin name. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Apr 2025 12:31:01 +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: Tomas Volf <~@wolfsden.cz> Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 77186@debbugs.gnu.org Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174368341428919 (code B ref 77186); Thu, 03 Apr 2025 12:31:01 +0000 Received: (at 77186) by debbugs.gnu.org; 3 Apr 2025 12:30:14 +0000 Received: from localhost ([127.0.0.1]:33204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Ji2-0007WM-2G for submit@debbugs.gnu.org; Thu, 03 Apr 2025 08:30:14 -0400 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:46495) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0Jhz-0007R2-Hu for 77186@debbugs.gnu.org; Thu, 03 Apr 2025 08:30:12 -0400 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-6e8f254b875so8247956d6.1 for <77186@debbugs.gnu.org>; Thu, 03 Apr 2025 05:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743683406; x=1744288206; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=+uVlkxqlnt3Tvuc2b6U02byTWsfoxM8WPo3iqL6khBY=; b=mQwcji5CZG2jLtGcDl4xswomKU5gZmojac+UvR41fZWF24L3qqCHWHIYkSwYeeSo57 rdL9RiQv9Bb84/qYScwOoEYiZxEnwrY3YXEoGpuoDboeo+9GmWBOQ0172ONtcMc/yf60 GTxWprDgyc5MXb6O7nuePrnakmHIa+1oSW0QD2dmELi/JgVeCvTpgFVD8qd/KF8WYrDC hIvQ/zPalMkm3fFZYbb08MqyeIxLzC10BcW55/XaRVk2bS4tlsUV9xpPBDu1bwJNvM9+ WoDMU+elINgTNI72R4i9bHh6d/Dj0jlWyW+t9TQnYWt2p8Bxu5DYyTNHnk/S/C6ZFhed MMBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743683406; x=1744288206; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+uVlkxqlnt3Tvuc2b6U02byTWsfoxM8WPo3iqL6khBY=; b=cuWa3YK9+kQk/om3WLkSxfX08aBjK05llpzo/f5Ah/vfOoPKSVg/GbscxsFh6KBWy7 JLSY8Casf2SqYuQHdXfWkW0kPG39W9THAUFnD0sr8qvcBK2QbPbn4+LCpUKJtbiYZrUq ssPj7AQRiGzSBTkjcUAb7JVnnu+Ab8u2at7V1v1pWQfN9Nys8oz1kRgZfyc1Mns8zA+8 4FIOkf5Nve8e4M16fTRk82F5ZniFen8wzE3ojYegxyUvw9ZFgucOVarxBhQMCYyyYm0C 3QbNaUDJbpQ94CqHUB+kBwgguxfIZ2YvHIVWJLD6nhfx7CAQ1zFkvJFVLfg9WiBuIdnD vRYA== X-Gm-Message-State: AOJu0YwgVlg4U9Ky4E5QJhLo5kX938HGopW2OEMcejx4TVVZZqe0NVe2 wWqPxjfS5BKEorU4vjivXhXfpPWd8k3Fv9OTXZJqFtV9u9POjG0j X-Gm-Gg: ASbGncsWbAhJsQWQZx77nEyQSLu2It6oQ4L/gZN5ZMrS9BKSQ3f17/kcpjm3mH7/J96 B1s8y8FPIxqCYfm8QagJDXGHEBVen+eEKaQBgc2QTOOoFoYnqS7Oj0tL6p4J5vWlAym5YaMRbQn qa+WzXX27Wc7iqL6EscE/p5pq8WMMVMNq4stBRtlKH9onU3CihImwzj+0xJRsFdNoZSJcdj4ILH OI39lTlofoSfxu3ZcyePPulftr9hXtGwfoMsbnLXGfiLthZ7tGI4UmqjlFGsxx5CpMt5NU6gDz7 FHmhUYRs6y7PAMP08/WqgDbznvdedFQ+6+FetC5NvrOQ6je55EfXRYNpzvhnQBcZcg== X-Google-Smtp-Source: AGHT+IEKopfjKA5JNXtD8yvHbeuJN1eCqmnANfMyotH7Qqlgo87jZFaYml9/0mv5BbmWFs01VuL8UQ== X-Received: by 2002:a05:6214:4110:b0:6e8:f433:20a8 with SMTP id 6a1803df08f44-6ef02bafabamr83211356d6.9.1743683405817; Thu, 03 Apr 2025 05:30:05 -0700 (PDT) Received: from terra (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ef0f14d2a7sm6874856d6.107.2025.04.03.05.30.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 05:30:05 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <10ec1b1b255fb295438974862d806a2a19ed9754.1743459020.git.~@wolfsden.cz> (Tomas Volf's message of "Tue, 1 Apr 2025 00:10:20 +0200") References: <10ec1b1b255fb295438974862d806a2a19ed9754.1743459020.git.~@wolfsden.cz> Date: Thu, 03 Apr 2025 21:29:47 +0900 Message-ID: <878qohzav8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, Tomas Volf <~@wolfsden.cz> writes: > * gnu/services/version-control.scm (): Add admin-name > field. > (gitolite-activation): Use it. > * doc/guix.texi (Version Control Services): Document it. Remove the wrong > default value of admin-pubkey. State the need for .pub extension. > > Change-Id: Idadf4b2697cee6d1da10e6ba03bdc2e1d729c417 > --- > doc/guix.texi | 9 ++++++++- > gnu/services/version-control.scm | 17 +++++++++++------ > 2 files changed, 19 insertions(+), 7 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index ad4a623916..5db6f28f7d 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -41013,7 +41013,7 @@ Version Control Services > A ``file-like'' object (@pxref{G-Expressions, file-like objects}), > representing the git configuration for Gitolite. > > -@item @code{admin-pubkey} (default: @code{#f}) > +@item @code{admin-pubkey} > A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to > setup Gitolite. This will be inserted in to the @file{keydir} directory > within the gitolite-admin repository. > @@ -41024,6 +41024,13 @@ Version Control Services > (plain-file "yourname.pub" "ssh-rsa AAAA... guix@@example.com") > @end lisp > > +The file has to have @file{.pub} extension. This could be checked in a sanitizer, with a cute error message + fix hint shown. -- Thanks, Maxim From unknown Sat Aug 09 15:18:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tomas Volf <~@wolfsden.cz> Subject: bug#77186: closed (Re: [bug#77186] [PATCH 00/13] Revamp the gitolite-service-type) Message-ID: References: <874iz5za5k.fsf@gmail.com> X-Gnu-PR-Message: they-closed 77186 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 77186@debbugs.gnu.org Date: Thu, 03 Apr 2025 12:46:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1743684362-31513-1" This is a multi-part message in MIME format... ------------=_1743684362-31513-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #77186: [PATCH 00/13] Revamp the gitolite-service-type which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 77186@debbugs.gnu.org. --=20 77186: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77186 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1743684362-31513-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 77186-done) by debbugs.gnu.org; 3 Apr 2025 12:45:39 +0000 Received: from localhost ([127.0.0.1]:33226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0Jwx-0008Bb-9X for submit@debbugs.gnu.org; Thu, 03 Apr 2025 08:45:39 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:61683) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0Jwu-0008BN-33 for 77186-done@debbugs.gnu.org; Thu, 03 Apr 2025 08:45:37 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22580c9ee0aso9550595ad.2 for <77186-done@debbugs.gnu.org>; Thu, 03 Apr 2025 05:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743684329; x=1744289129; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=K26gdBgDXHOvPsKsCOrzLw5O+NWchCjwqH0U5PztCMQ=; b=VtismMmlmOq0dey94WZoRYKdxKGxVOvChOSKIy3eV1LSgZl5X7c7P4j0OIvNSyjmg3 cn0rlQpxvWrESPqx6BRmXCy6WG3+1PfKV4MGBbZTwJrInjbJIjmGqcOjgO7SAs60HnxJ bUoyN8DNBO5e7RqSNC6eEHKzZdFVT8ECOhidEanZuuAMJzVDWhz2mebY4RPjMkhTd83k cBmJDgfQJDwD35Z0lEOnE4Z53MeJsHA93sAhcKJWIHacxjn0o3wtNfsVPbCu0x+M5fX1 Qr+cA+C3x4CDgZwdDOUucjfLmzXlCjTvvgIhp3rfzro4kUwvgdUeBnO1kGtZ7zT/3gR4 zaYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743684329; x=1744289129; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=K26gdBgDXHOvPsKsCOrzLw5O+NWchCjwqH0U5PztCMQ=; b=RTAOZV6rCoTxXy/0tQnWu/4T2PYTQJZzwlcNeLbdCiu2OqTGzL181ZqKsEyR8Lw2N1 29S8Rz2KCAm5kpg7ghNWXnVrajHo/VXuLD5PuROulo7UwY+Suf54T3vximLC9GJDNi0U +kx2VjQ/0H+cvM50FJdH3ld4xX91krYLp92mBPKbXPu7DWbTR9WjMeS+ySABsk8RTkF+ Tzpou0eVREfxizjIjpaSTueW9BCnaKCs9wqaCsrsikRnzaup4ljMyQcP913OwEZMggTd pGzYiIfjMb58o7xoA9WQRtPwsz0NLOk7BkAtMb0kAkQUhvUW1wxNLUeg6GpVmE+UZPrZ eVsw== X-Forwarded-Encrypted: i=1; AJvYcCVQmZTzChgsAb2GYV3ke+F///6uzEBVq2ig0LwKjJHV8rDo2fzToP/akVHRh/5O+D/syB5D75TUj+jm@debbugs.gnu.org X-Gm-Message-State: AOJu0YwiWNfc0SXyeX5BhvSPv8YRkNKEvH4xWqmoBOAMaXjI7oJhNv8r vuLMnbddHC+juXEOqhNzk2Vokskx/x42c/c0yvEiaPNXYR1vixMWmvE5NN+0 X-Gm-Gg: ASbGncvIl7+vNzqp9gUdVMHUYmLy/mAo2+W6HtuyQNRLXGb+xwSLIu+1sjtNfoW5Joc T8TtMqKRyQZ69PgzlL3dJA+ZIgOGtmcn196A+sSqz65CITsOoHsy+XhZu8dBq9UyT4yv/SGT3wd WbMDYaUoTgRJSyLBVUf7rwy3szh9rj+ktOPV4gJZtSv9hLn3H7te0Kcy+TBp2VgjU94bRmSUvmW xRx4tckJlAFY1qt+TsmNh2uWE9A2/uJLvYdZVWxLPHljqRvJr/e9wzTylHGGy3XpeT9xXCpKbY1 Z81D8JOIfW/HlW/7j+0dElcM3bFekbM4LdwrbyG2yxg= X-Google-Smtp-Source: AGHT+IGNffToTJZDOpAEilWDyO/Tg39lPb+a4gnFxKUxJKkng+Oc3K/rXPnYLk6CkQEPhPD5ZZ63eg== X-Received: by 2002:a17:902:ebd1:b0:223:3630:cd32 with SMTP id d9443c01a7336-2292fa162abmr321645285ad.53.1743684329338; Thu, 03 Apr 2025 05:45:29 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2297877283asm13162075ad.226.2025.04.03.05.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 05:45:28 -0700 (PDT) From: Maxim Cournoyer To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#77186] [PATCH 00/13] Revamp the gitolite-service-type In-Reply-To: <87v7rvvwzm.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 27 Mar 2025 14:55:09 +0900") References: <87v7rvvwzm.fsf@gmail.com> Date: Thu, 03 Apr 2025 21:45:11 +0900 Message-ID: <874iz5za5k.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77186-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 77186-done@debbugs.gnu.org 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: -1.0 (-) Hi, Maxim Cournoyer writes: > Hi, > > Tomas Volf <~@wolfsden.cz> writes: > >> Extensions and improvements for the gitolite-service-type. >> >> Tomas Volf (13): >> services: gitolite-rc-file-compiler: Switch to match-record. >> services: gitolite-rc-file: Add log-extra field. >> services: gitolite-rc-file: Add host-name field. >> services: gitolite-rc-file: Add extra-content field. >> services: gitolite-rc-file-compiler: Set mode of the generated file. >> services: gitolite-rc-file: Export default value for enable. >> services: gitolite-service-type: Do not install gitolite package. >> services: gitolite-accounts: Convert to match-record. >> services: gitolite-activation: Convert to match-record. >> services: Add gitolite-git-configuration. >> services: gitolite-git-configuration: Add default-branch field. >> services: gitolite-git-configuration: Add receive-fsck-objects field. >> services: gitolite-git-configuration: Add extra-content field. >> >> doc/guix.texi | 41 +++++ >> gnu/packages/version-control.scm | 5 +- > > Apart from my comment w.r.t to the log-extra default value in patch > 2/13, this LGTM. Could you clarify my question for said patch? Applied, thank you! -- Maxim ------------=_1743684362-31513-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Mar 2025 16:48:56 +0000 Received: from localhost ([127.0.0.1]:45007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw21m-0005v8-OQ for submit@debbugs.gnu.org; Sat, 22 Mar 2025 12:48:56 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44258) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw21k-0005uW-H5 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 12:48:52 -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 <~@wolfsden.cz>) id 1tw21c-0003lb-AW for guix-patches@gnu.org; Sat, 22 Mar 2025 12:48:44 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tw21a-0002Kg-CM for guix-patches@gnu.org; Sat, 22 Mar 2025 12:48:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 5CE2D37E975; Sat, 22 Mar 2025 16:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662119; bh=+MvHkwy/ajJE9yDgNr7XrWltU0l1EOOAs4r1cMrKdps=; h=From:To:Cc:Subject:Date; b=AKIQtpZRB+WaB0CvN+N7P2x0XEPEkRxNSIAmoqQzunlk3LRSpZb+8dxD/Dqxa/rKP z45hW86j4pTXYed+34IgM87/Bb//+72CunPh6LkSfeNREJlDT7gq0Q313Vhgi0SpVa fqxdbsny1mvzZv/K1pX9sjHzPakiOT0aEA+Vqtp/H8sZ3HkhP/1q+oQ+nlk/el4dye fCQ4ZXGFLSrz4vI50FHMTtL4y04+BKzSChc5X20nvXqkC6xUUmtppCPkTMYsB0udg4 q+ome3h/qIA9nq50fY1lgYP07m0uQmfm0cTFy4W3ki3IH4R4c0Od/tiyCHrP6nVhEb nhYn6h+QX7Hgcz0rraSc/m6SDCqeXn6UVa89mu/yHeTC7lAAtyJSK0eC2OW8abU03i MUaVK6hcCWTLHxvLRYYLE7KduPywDkRc51R6UX3SW0TdwUIx5h4SY3apJjqIG9BNue cwigr3KJJzCP5a5whzS+3OEwCvnkZ8UT4ZyYEIZ1fPMDtGauBJGR8ZBq0xpFz1HF4Q Vn9oeh/PLpg7FFFzvMH+Ra8a5CVA5XqXutCmVZI0odLKr8KsgM9GCudVnpfxLcSz2F BfjqwzptAkiyEEMNJqh3yqdmqIOyYQdJvxJow2hmKaJnzkMZnINgjwov+tB74X9QJl FBmOUZJ4FEPcYAqOHq12IhF8= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 6ABC937EB66; Sat, 22 Mar 2025 16:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662117; bh=+MvHkwy/ajJE9yDgNr7XrWltU0l1EOOAs4r1cMrKdps=; h=From:To:Cc:Subject:Date; b=ppR6T3XCGT3DAx8xCPf02a3k8iqnzWw9ra3wPDrFqDKSy3Sb+cQ7BUrQT8D+/np3M oQ9eEPQSg8ag3q/SF0UUujmKU2qlrNjJDRTWsYGJty0H9RkOCsLpUrOPbvfZLGCDR+ nIkVDEttUh0Fo2NYcFTkZOXgvAi3//igBW3bSthdZNxHbGNCXwHDXXdKtLNcElcyRd fOnpGOLhW8t15t1NxivEIcqoO6O7hE187W914o979OmfoSxa4wmz3zVjp0ozgzPs8y CVBM+lcTDldzDGQiqsW7/ptHruHidvI2qE8ljoJlYEEHP030lAtiRv3nGFO+zr0cIC gf96ehxrUmittmcTl2oIgRQrCVuPA+Mtj0+q/CaK2bWRVBhA5gmBCnTVRxboKlHTtS cBxR5hcJclccIWqtiwcb3w28XK16TueKXK79XuIJMqM7K5Tl4eUqjHm1J740GXnQy7 x4/Kjq/JgtWL2clZWk20HBlCf8V30ZPUTopCpoJkeFYslUz4dShJ8MywM/pUj/HJMm vLG7GZf4wT/A5dCh23AmkiqAHGd0CyFBCF0FOofda3661w37/uAafaXUoC1ai8FMQs sEN2C3HSi7y8CN6FbAyThL5QhJPO5m0xzGXc4L4LZg3niiivAvSrGyBsImpTWMCwo/ 1LrkVFmigKp6kAQwZInUFroM= From: Tomas Volf <~@wolfsden.cz> To: guix-patches@gnu.org Subject: [PATCH 00/13] Revamp the gitolite-service-type Date: Sat, 22 Mar 2025 17:48:31 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Tomas Volf <~@wolfsden.cz> 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.0 (/) Extensions and improvements for the gitolite-service-type. Tomas Volf (13): services: gitolite-rc-file-compiler: Switch to match-record. services: gitolite-rc-file: Add log-extra field. services: gitolite-rc-file: Add host-name field. services: gitolite-rc-file: Add extra-content field. services: gitolite-rc-file-compiler: Set mode of the generated file. services: gitolite-rc-file: Export default value for enable. services: gitolite-service-type: Do not install gitolite package. services: gitolite-accounts: Convert to match-record. services: gitolite-activation: Convert to match-record. services: Add gitolite-git-configuration. services: gitolite-git-configuration: Add default-branch field. services: gitolite-git-configuration: Add receive-fsck-objects field. services: gitolite-git-configuration: Add extra-content field. doc/guix.texi | 41 +++++ gnu/packages/version-control.scm | 5 +- gnu/services/version-control.scm | 302 ++++++++++++++++++------------- 3 files changed, 223 insertions(+), 125 deletions(-) -- 2.48.1 ------------=_1743684362-31513-1--