Package: guix-patches;
Reported by: Tomas Volf <~@wolfsden.cz>
Date: Sat, 22 Mar 2025 16:49:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To reply to this bug, email your comments to 77186 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 16:49:02 GMT) Full text and rfc822 format available.Tomas Volf <~@wolfsden.cz>:ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org.
(Sat, 22 Mar 2025 16:49:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: guix-patches <at> gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 00/13] Revamp the gitolite-service-type Date: Sat, 22 Mar 2025 17:48:31 +0100
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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:01:02 GMT) Full text and rfc822 format available.Message #8 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 02/13] services: gitolite-rc-file: Add log-extra field. Date: Sat, 22 Mar 2025 18:00:22 +0100
* 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
---
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* <gitolite-rc-file>
(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* <gitolite-rc-file>
(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"
@@ -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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:01:02 GMT) Full text and rfc822 format available.Message #11 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:01:03 GMT) Full text and rfc822 format available.Message #14 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 01/13] services: gitolite-rc-file-compiler: Switch to match-record. Date: Sat, 22 Mar 2025 18:00:21 +0100
* 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* <gitolite-rc-file>
(define-gexp-compiler (gitolite-rc-file-compiler
(file <gitolite-rc-file>) system target)
- (match file
- (($ <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)
- (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 <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)
+ (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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:01:03 GMT) Full text and rfc822 format available.Message #17 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 03/13] services: gitolite-rc-file: Add host-name field. Date: Sat, 22 Mar 2025 18:00:23 +0100
* gnu/services/version-control.scm (<gitolite-rc-file>): 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* <gitolite-rc-file>
(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 <gitolite-rc-file>) system target)
(match-record file <gitolite-rc-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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:03 GMT) Full text and rfc822 format available.Message #20 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 07/13] services: gitolite-service-type: Do not install gitolite package. Date: Sat, 22 Mar 2025 18:00:27 +0100
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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:03 GMT) Full text and rfc822 format available.Message #23 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 08/13] services: gitolite-accounts: Convert to match-record. Date: Sat, 22 Mar 2025 18:00:28 +0100
* 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* <gitolite-configuration>
(default (gitolite-rc-file)))
(admin-pubkey gitolite-configuration-admin-pubkey))
-(define gitolite-accounts
- (match-lambda
- (($ <gitolite-configuration> 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 <gitolite-configuration>
+ (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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:04 GMT) Full text and rfc822 format available.Message #26 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 05/13] services: gitolite-rc-file-compiler: Set mode of the generated file. Date: Sat, 22 Mar 2025 18:00:25 +0100
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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:04 GMT) Full text and rfc822 format available.Message #29 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 06/13] services: gitolite-rc-file: Export default value for enable. Date: Sat, 22 Mar 2025 18:00:26 +0100
* 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>
gitolite-rc-file make-gitolite-rc-file
gitolite-rc-file?
@@ -262,15 +274,7 @@ (define-record-type* <gitolite-rc-file>
(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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:05 GMT) Full text and rfc822 format available.Message #32 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 09/13] services: gitolite-activation: Convert to match-record. Date: Sat, 22 Mar 2025 18:00:29 +0100
* 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
- (($ <gitolite-configuration> package user group home
- rc-file admin-pubkey)
- #~(begin
- (use-modules (ice-9 match)
- (guix build utils))
+(define (gitolite-activation config)
+ (match-record config <gitolite-configuration>
+ (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 <at> 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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:05 GMT) Full text and rfc822 format available.Message #35 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 10/13] services: Add gitolite-git-configuration. Date: Sat, 22 Mar 2025 18:00:30 +0100
In preparation for further customizability of the git configuration, extract
the current setup into a separate record type.
* gnu/services/version-control.scm (<gitolite-git-configuration>): New record
type.
(gitolite-git-configuration-compiler): And gexp compiler for it.
(<gitolite-configuration>): 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?
+ 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>
+ 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 <at> localhost")))
+
+(define-gexp-compiler (gitolite-git-configuration-compiler
+ (config <gitolite-git-configuration>) system target)
+ (match-record config <gitolite-git-configuration>
+ (name email)
+ (apply text-file* "gitconfig"
+ `("[user]\n"
+ "name = " ,name "\n"
+ "email = " ,email "\n"))))
+
(define-record-type* <gitolite-configuration>
gitolite-configuration make-gitolite-configuration
gitolite-configuration?
@@ -333,6 +356,8 @@ (define-record-type* <gitolite-configuration>
(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 <gitolite-configuration>
- (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 <at> 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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:06 GMT) Full text and rfc822 format available.Message #38 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 11/13] services: gitolite-git-configuration: Add default-branch field. Date: Sat, 22 Mar 2025 18:00:31 +0100
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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>
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 <at> localhost")))
+ (name gitolite-git-configuration-name
+ (default "GNU Guix"))
+ (email gitolite-git-configuration-email
+ (default "guix <at> localhost"))
+ (default-branch gitolite-git-configuration-default-branch
+ (default #f)))
(define-gexp-compiler (gitolite-git-configuration-compiler
(config <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:06 GMT) Full text and rfc822 format available.Message #41 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 12/13] services: gitolite-git-configuration: Add receive-fsck-objects field. Date: Sat, 22 Mar 2025 18:00:32 +0100
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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>
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 <at> 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 <at> 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 <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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* <gitolite-configuration>
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:02:07 GMT) Full text and rfc822 format available.Message #44 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH 13/13] services: gitolite-git-configuration: Add extra-content field. Date: Sat, 22 Mar 2025 18:00:33 +0100
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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* <gitolite-git-configuration>
(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 <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:02 GMT) Full text and rfc822 format available.Message #47 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 01/13] services: gitolite-rc-file-compiler: Switch to match-record. Date: Sat, 22 Mar 2025 18:09:02 +0100
* 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 <clement <at> lassieur.org>
;;; Copyright © 2018 Christopher Baines <mail <at> cbaines.net>
;;; Copyright © 2021 Julien Lepiller <julien <at> lepiller.eu>
+;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -267,33 +268,33 @@ (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 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 <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)
+ (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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:02 GMT) Full text and rfc822 format available.Message #50 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 02/13] services: gitolite-rc-file: Add log-extra field. Date: Sat, 22 Mar 2025 18:09:03 +0100
* 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
---
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* <gitolite-rc-file>
(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* <gitolite-rc-file>
(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 @@ (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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:03 GMT) Full text and rfc822 format available.Message #53 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 05/13] services: gitolite-rc-file-compiler: Set mode of the generated file. Date: Sat, 22 Mar 2025 18:09:06 +0100
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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:03 GMT) Full text and rfc822 format available.Message #56 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 03/13] services: gitolite-rc-file: Add host-name field. Date: Sat, 22 Mar 2025 18:09:04 +0100
* gnu/services/version-control.scm (<gitolite-rc-file>): 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* <gitolite-rc-file>
(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 <gitolite-rc-file>) system target)
(match-record file <gitolite-rc-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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:04 GMT) Full text and rfc822 format available.Message #59 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 06/13] services: gitolite-rc-file: Export default value for enable. Date: Sat, 22 Mar 2025 18:09:07 +0100
* 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>
gitolite-rc-file make-gitolite-rc-file
gitolite-rc-file?
@@ -263,15 +275,7 @@ (define-record-type* <gitolite-rc-file>
(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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:04 GMT) Full text and rfc822 format available.Message #62 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 08/13] services: gitolite-accounts: Convert to match-record. Date: Sat, 22 Mar 2025 18:09:09 +0100
* 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* <gitolite-configuration>
(default (gitolite-rc-file)))
(admin-pubkey gitolite-configuration-admin-pubkey))
-(define gitolite-accounts
- (match-lambda
- (($ <gitolite-configuration> 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 <gitolite-configuration>
+ (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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:05 GMT) Full text and rfc822 format available.Message #65 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 07/13] services: gitolite-service-type: Do not install gitolite package. Date: Sat, 22 Mar 2025 18:09:08 +0100
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 <sharlatanus <at> gmail.com>
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
;;; Copyright © 2025 Dariqq <dariqq <at> posteo.net>
+;;; 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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:05 GMT) Full text and rfc822 format available.Message #68 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 09/13] services: gitolite-activation: Convert to match-record. Date: Sat, 22 Mar 2025 18:09:10 +0100
* 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
- (($ <gitolite-configuration> package user group home
- rc-file admin-pubkey)
- #~(begin
- (use-modules (ice-9 match)
- (guix build utils))
+(define (gitolite-activation config)
+ (match-record config <gitolite-configuration>
+ (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 <at> 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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:06 GMT) Full text and rfc822 format available.Message #71 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 10/13] services: Add gitolite-git-configuration. Date: Sat, 22 Mar 2025 18:09:11 +0100
In preparation for further customizability of the git configuration, extract
the current setup into a separate record type.
* gnu/services/version-control.scm (<gitolite-git-configuration>): New record
type.
(gitolite-git-configuration-compiler): And gexp compiler for it.
(<gitolite-configuration>): 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?
+ 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>
+ 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 <at> localhost")))
+
+(define-gexp-compiler (gitolite-git-configuration-compiler
+ (config <gitolite-git-configuration>) system target)
+ (match-record config <gitolite-git-configuration>
+ (name email)
+ (apply text-file* "gitconfig"
+ `("[user]\n"
+ "name = " ,name "\n"
+ "email = " ,email "\n"))))
+
(define-record-type* <gitolite-configuration>
gitolite-configuration make-gitolite-configuration
gitolite-configuration?
@@ -334,6 +357,8 @@ (define-record-type* <gitolite-configuration>
(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 <gitolite-configuration>
- (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 <at> 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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:07 GMT) Full text and rfc822 format available.Message #74 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 13/13] services: gitolite-git-configuration: Add extra-content field. Date: Sat, 22 Mar 2025 18:09:14 +0100
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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* <gitolite-git-configuration>
(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 <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:07 GMT) Full text and rfc822 format available.Message #77 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 12/13] services: gitolite-git-configuration: Add receive-fsck-objects field. Date: Sat, 22 Mar 2025 18:09:13 +0100
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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>
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 <at> 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 <at> 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 <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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* <gitolite-configuration>
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:08 GMT) Full text and rfc822 format available.Message #80 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 11/13] services: gitolite-git-configuration: Add default-branch field. Date: Sat, 22 Mar 2025 18:09:12 +0100
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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>
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 <at> localhost")))
+ (name gitolite-git-configuration-name
+ (default "GNU Guix"))
+ (email gitolite-git-configuration-email
+ (default "guix <at> localhost"))
+ (default-branch gitolite-git-configuration-default-branch
+ (default #f)))
(define-gexp-compiler (gitolite-git-configuration-compiler
(config <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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>
gitolite-configuration make-gitolite-configuration
--
2.48.1
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Sat, 22 Mar 2025 17:11:09 GMT) Full text and rfc822 format available.Message #83 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 04/13] services: gitolite-rc-file: Add extra-content field. Date: Sat, 22 Mar 2025 18:09:05 +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 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* <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"
@@ -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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 05:41:03 GMT) Full text and rfc822 format available.Message #86 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 02/13] services: gitolite-rc-file: Add log-extra field. Date: Thu, 27 Mar 2025 14:40:31 +0900
Hi Tomas,
Tomas Volf <~@wolfsden.cz> writes:
> * 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.
[...]
> +@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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 05:44:02 GMT) Full text and rfc822 format available.Message #89 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 04/13] services: gitolite-rc-file: Add extra-content field. Date: Thu, 27 Mar 2025 14:42:39 +0900
Hi,
Tomas Volf <~@wolfsden.cz> writes:
> * 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.
What is the %RC hash?
Otherwise, LGTM.
--
Thanks,
Maxim
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 05:47:01 GMT) Full text and rfc822 format available.Message #92 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 06/13] services: gitolite-rc-file: Export default value for enable. Date: Thu, 27 Mar 2025 14:45:34 +0900
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>
> gitolite-rc-file make-gitolite-rc-file
> gitolite-rc-file?
> @@ -263,15 +275,7 @@ (define-record-type* <gitolite-rc-file>
> (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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 05:48:03 GMT) Full text and rfc822 format available.Message #95 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 07/13] services: gitolite-service-type: Do not install gitolite package. Date: Thu, 27 Mar 2025 14:46:52 +0900
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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 05:56:03 GMT) Full text and rfc822 format available.Message #98 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH 00/13] Revamp the gitolite-service-type Date: Thu, 27 Mar 2025 14:55:09 +0900
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 <maxim.cournoyer <at> gmail.com> -- Thanks, Maxim
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 17:39:02 GMT) Full text and rfc822 format available.Message #101 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 02/13] services: gitolite-rc-file: Add log-extra field. Date: Thu, 27 Mar 2025 18:38:48 +0100
Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
> Hi Tomas,
>
> Tomas Volf <~@wolfsden.cz> writes:
>
>> * 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.
>
> [...]
>
>> +@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.
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 17:44:05 GMT) Full text and rfc822 format available.Message #104 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 04/13] services: gitolite-rc-file: Add extra-content field. Date: Thu, 27 Mar 2025 18:43:23 +0100
Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
> Hi,
>
> Tomas Volf <~@wolfsden.cz> writes:
>
>> * 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.
>
> 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.
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 27 Mar 2025 17:47:02 GMT) Full text and rfc822 format available.Message #107 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 06/13] services: gitolite-rc-file: Export default value for enable. Date: Thu, 27 Mar 2025 18:46:54 +0100
Maxim Cournoyer <maxim.cournoyer <at> gmail.com> 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.
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:11:03 GMT) Full text and rfc822 format available.Message #110 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 05/14] services: gitolite-rc-file-compiler: Set mode of the generated file. Date: Tue, 1 Apr 2025 00:10:11 +0200
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>
gitolite-configuration make-gitolite-configuration
--
2.49.0
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:11:03 GMT) Full text and rfc822 format available.Message #113 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 02/14] services: gitolite-rc-file: Add log-extra field. Date: Tue, 1 Apr 2025 00:10:08 +0200
* 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
---
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* <gitolite-rc-file>
(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* <gitolite-rc-file>
(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 @@ (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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:02 GMT) Full text and rfc822 format available.Message #116 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 01/14] services: gitolite-rc-file-compiler: Switch to match-record. Date: Tue, 1 Apr 2025 00:10:07 +0200
* 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 <clement <at> lassieur.org>
;;; Copyright © 2018 Christopher Baines <mail <at> cbaines.net>
;;; Copyright © 2021 Julien Lepiller <julien <at> lepiller.eu>
+;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -267,33 +268,33 @@ (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 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 <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)
+ (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>
gitolite-configuration make-gitolite-configuration
--
2.49.0
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:03 GMT) Full text and rfc822 format available.Message #119 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 06/14] services: gitolite-rc-file: Export default value for enable. Date: Tue, 1 Apr 2025 00:10:12 +0200
* 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>
gitolite-rc-file make-gitolite-rc-file
gitolite-rc-file?
@@ -263,15 +275,7 @@ (define-record-type* <gitolite-rc-file>
(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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:03 GMT) Full text and rfc822 format available.Message #122 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 03/14] services: gitolite-rc-file: Add host-name field. Date: Tue, 1 Apr 2025 00:10:09 +0200
* gnu/services/version-control.scm (<gitolite-rc-file>): 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* <gitolite-rc-file>
(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 <gitolite-rc-file>) system target)
(match-record file <gitolite-rc-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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:04 GMT) Full text and rfc822 format available.Message #125 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 08/14] services: gitolite-accounts: Convert to match-record. Date: Tue, 1 Apr 2025 00:10:14 +0200
* 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* <gitolite-configuration>
(default (gitolite-rc-file)))
(admin-pubkey gitolite-configuration-admin-pubkey))
-(define gitolite-accounts
- (match-lambda
- (($ <gitolite-configuration> 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 <gitolite-configuration>
+ (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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:05 GMT) Full text and rfc822 format available.Message #128 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 04/14] services: gitolite-rc-file: Add extra-content field. Date: Tue, 1 Apr 2025 00:10:10 +0200
* 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 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* <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"
@@ -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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:05 GMT) Full text and rfc822 format available.Message #131 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 12/14] services: gitolite-git-configuration: Add receive-fsck-objects field. Date: Tue, 1 Apr 2025 00:10:18 +0200
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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>
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 <at> 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 <at> 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 <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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* <gitolite-configuration>
--
2.49.0
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:06 GMT) Full text and rfc822 format available.Message #134 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 10/14] services: Add gitolite-git-configuration. Date: Tue, 1 Apr 2025 00:10:16 +0200
In preparation for further customizability of the git configuration, extract
the current setup into a separate record type.
* gnu/services/version-control.scm (<gitolite-git-configuration>): New record
type.
(gitolite-git-configuration-compiler): And gexp compiler for it.
(<gitolite-configuration>): 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?
+ 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>
+ 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 <at> localhost")))
+
+(define-gexp-compiler (gitolite-git-configuration-compiler
+ (config <gitolite-git-configuration>) system target)
+ (match-record config <gitolite-git-configuration>
+ (name email)
+ (apply text-file* "gitconfig"
+ `("[user]\n"
+ "name = " ,name "\n"
+ "email = " ,email "\n"))))
+
(define-record-type* <gitolite-configuration>
gitolite-configuration make-gitolite-configuration
gitolite-configuration?
@@ -334,6 +357,8 @@ (define-record-type* <gitolite-configuration>
(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 <gitolite-configuration>
- (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 <at> 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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:06 GMT) Full text and rfc822 format available.Message #137 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 07/14] services: gitolite-service-type: Do not install gitolite package. Date: Tue, 1 Apr 2025 00:10:13 +0200
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 <sharlatanus <at> gmail.com>
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
;;; Copyright © 2025 Dariqq <dariqq <at> posteo.net>
+;;; 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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:07 GMT) Full text and rfc822 format available.Message #140 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 09/14] services: gitolite-activation: Convert to match-record. Date: Tue, 1 Apr 2025 00:10:15 +0200
* 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
- (($ <gitolite-configuration> package user group home
- rc-file admin-pubkey)
- #~(begin
- (use-modules (ice-9 match)
- (guix build utils))
+(define (gitolite-activation config)
+ (match-record config <gitolite-configuration>
+ (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 <at> 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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:08 GMT) Full text and rfc822 format available.Message #143 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 11/14] services: gitolite-git-configuration: Add default-branch field. Date: Tue, 1 Apr 2025 00:10:17 +0200
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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>
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 <at> localhost")))
+ (name gitolite-git-configuration-name
+ (default "GNU Guix"))
+ (email gitolite-git-configuration-email
+ (default "guix <at> localhost"))
+ (default-branch gitolite-git-configuration-default-branch
+ (default #f)))
(define-gexp-compiler (gitolite-git-configuration-compiler
(config <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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>
gitolite-configuration make-gitolite-configuration
--
2.49.0
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:08 GMT) Full text and rfc822 format available.Message #146 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 14/14] services: gitolite-service-type: Allow setting the admin name. Date: Tue, 1 Apr 2025 00:10:20 +0200
* gnu/services/version-control.scm (<gitolite-configuration>): 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>
gitolite-rc-file
@@ -377,7 +378,9 @@ (define-record-type* <gitolite-configuration>
(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 <gitolite-configuration>
@@ -396,17 +399,19 @@ (define (gitolite-accounts config)
(define (gitolite-activation config)
(match-record config <gitolite-configuration>
( 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
ludo <at> gnu.org, maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Mon, 31 Mar 2025 22:12:09 GMT) Full text and rfc822 format available.Message #149 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: 77186 <at> debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH v2 13/14] services: gitolite-git-configuration: Add extra-content field. Date: Tue, 1 Apr 2025 00:10:19 +0200
* gnu/services/version-control.scm (<gitolite-git-configuration>): 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* <gitolite-git-configuration>
(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 <gitolite-git-configuration>) system target)
(match-record config <gitolite-git-configuration>
- (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>
gitolite-configuration make-gitolite-configuration
--
2.49.0
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 03 Apr 2025 12:27:01 GMT) Full text and rfc822 format available.Message #152 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 12/14] services: gitolite-git-configuration: Add receive-fsck-objects field. Date: Thu, 03 Apr 2025 21:25:56 +0900
Hi,
Tomas Volf <~@wolfsden.cz> writes:
[...]
> + ,@(if receive-fsck-objects
> + `("[receive]\n"
> + "fsckObjects = true\n")
> '())))))
>
> (define-record-type* <gitolite-configuration>
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
guix-patches <at> gnu.org:bug#77186; Package guix-patches.
(Thu, 03 Apr 2025 12:31:01 GMT) Full text and rfc822 format available.Message #155 received at 77186 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186 <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH v2 14/14] services: gitolite-service-type: Allow setting the admin name. Date: Thu, 03 Apr 2025 21:29:47 +0900
Hi,
Tomas Volf <~@wolfsden.cz> writes:
> * gnu/services/version-control.scm (<gitolite-configuration>): 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
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:Tomas Volf <~@wolfsden.cz>:Message #160 received at 77186-done <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Tomas Volf <~@wolfsden.cz> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77186-done <at> debbugs.gnu.org Subject: Re: [bug#77186] [PATCH 00/13] Revamp the gitolite-service-type Date: Thu, 03 Apr 2025 21:45:11 +0900
Hi, Maxim Cournoyer <maxim.cournoyer <at> gmail.com> 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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.