apteryx pushed a commit to branch master
in repository guix.
commit 9306539f08df3b59be9d7f02c92e3a21902fa15e
Author: Tomas Volf <[email protected]>
AuthorDate: Tue Apr 1 00:10:08 2025 +0200
services: gitolite-rc-file: Add log-extra field.
* gnu/services/version-control.scm (<gitolite-rc-file>): 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
Signed-off-by: Maxim Cournoyer <[email protected]>
---
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 385ca990bf..72e8d5d2b5 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -41058,6 +41058,13 @@ access on the server.
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 @@
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 @@ access to exported repositories under @file{/srv/git}."
(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 @@ access to exported repositories under @file{/srv/git}."
(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 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 @@ access to exported repositories under @file{/srv/git}."
,(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)
