GNU bug report logs - #77186
[PATCH 00/13] Revamp the gitolite-service-type

Previous Next

Full log

View this message in rfc822 format

From: Tomas Volf <~@wolfsden.cz>
To: 77186 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>, Ludovic Courtès <ludo <at> gnu.org>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [bug#77186] [PATCH 04/13] services: gitolite-rc-file: Add extra-content field.
Date: Sat, 22 Mar 2025 18:00:24 +0100

* gnu/services/version-control.scm (<gitolite-rc-file>): 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* <gitolite-rc-file>
                               "ssh-authkeys"
                               "git-config"
                               "daemon"
-                              "gitweb"))))
+                              "gitweb")))
+  (extra-content   gitolite-rc-extra-content
+                   (default "")))
 
 (define-gexp-compiler (gitolite-rc-file-compiler
                        (file <gitolite-rc-file>) system target)
   (match-record file <gitolite-rc-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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.