[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/11: services: gitolite: Add local-code configuration option.
From: |
guix-commits |
Subject: |
01/11: services: gitolite: Add local-code configuration option. |
Date: |
Mon, 7 Nov 2022 14:52:09 -0500 (EST) |
cbaines pushed a commit to branch master
in repository guix.
commit 73b35195681f8367e27ebf2a239c2d4790fb2304
Author: Alexey Abramov <levenson@mmer.org>
AuthorDate: Wed Oct 19 11:34:31 2022 +0200
services: gitolite: Add local-code configuration option.
* gnu/services/version-control.scm (gitolite-rc-file): Add local-code
field.
(gitolite-rc-file-compiler): Serialize the field.
* doc/guix.texi: Document it.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
doc/guix.texi | 9 +++++++++
gnu/services/version-control.scm | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 1eb47e31cf..3f76184495 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35736,6 +35736,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..b6b78e504e 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -54,6 +54,7 @@
<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 @@ access to exported repositories under @file{/srv/git}."
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,14 @@ access to exported repositories under @file{/srv/git}."
(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)
- branch master updated (b670dc6c8a -> 2c1fc058c5), guix-commits, 2022/11/07
- 02/11: gnu: Add siosocks., guix-commits, 2022/11/07
- 01/11: services: gitolite: Add local-code configuration option.,
guix-commits <=
- 07/11: gnu: Add avr-gdb., guix-commits, 2022/11/07
- 03/11: gnu: Add aioftp., guix-commits, 2022/11/07
- 04/11: gnu: Add pytest-socket., guix-commits, 2022/11/07
- 09/11: gnu: rlwrap: Update to 0.46.1., guix-commits, 2022/11/07
- 05/11: gnu: Add parfive., guix-commits, 2022/11/07
- 11/11: gnu: teximpatient: Update to 2.4-0.e3666ab., guix-commits, 2022/11/07
- 10/11: services: qemu-binfmt: Add x86_64 QEMU target., guix-commits, 2022/11/07
- 08/11: build-system/linux-module: Add #:source-directory to linux-module-build-cross., guix-commits, 2022/11/07
- 06/11: gnu: Add kconfig-hardened-check., guix-commits, 2022/11/07