(address . guix-patches@gnu.org)
20221103161525.2130-1-levenson@mmer.org
* gnu/services/version-control.scm (gitolite-rc-file): Add local-code
field.
(gitolite-rc-file-compiler): Serialize the field.
* doc/guix.texi: Document it.
---
doc/guix.texi | 9 +++++++++
gnu/services/version-control.scm | 7 ++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
Toggle diff (58 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 80fb3bc47f..c05c7961e5 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35704,6 +35704,15 @@ A value like @code{#o0027} will give read access to the group used by Gitolite
(by default: @code{git}). This is necessary when using Gitolite with software
like cgit or gitweb.
+@item @code{local-code} (default: @code{"$rc@{GL_ADMIN_BASE@}/local"})
+Allows you to add your own non-core programs, or even override the
+shipped ones with your own.
+
+Please supply the FULL path to this variable. By default, directory
+called "local" in your gitolite clone is used, providing the benefits of
+versioning them as well as making changes to them without having to log
+on to the server.
+
@item @code{unsafe-pattern} (default: @code{#f})
An optional Perl regular expression for catching unsafe configurations in
the configuration file. See
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
index cd8763f5ea..8c9701afe0 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -54,6 +54,7 @@ (define-module (gnu services version-control)
<gitolite-rc-file>
gitolite-rc-file
+ gitolite-rc-file-local-code
gitolite-rc-file-umask
gitolite-rc-file-unsafe-pattern
gitolite-rc-file-git-config-keys
@@ -242,6 +243,8 @@ (define-record-type* <gitolite-rc-file>
gitolite-rc-file?
(umask gitolite-rc-file-umask
(default #o0077))
+ (local-code gitolite-rc-file-local-code
+ (default "$rc{GL_ADMIN_BASE}/local"))
(unsafe-pattern gitolite-rc-file-unsafe-pattern
(default #f))
(git-config-keys gitolite-rc-file-git-config-keys
@@ -263,11 +266,13 @@ (define-record-type* <gitolite-rc-file>
(define-gexp-compiler (gitolite-rc-file-compiler
(file <gitolite-rc-file>) system target)
(match file
- (($ <gitolite-rc-file> umask unsafe-pattern git-config-keys roles enable)
+ (($ <gitolite-rc-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)
--
2.36.1