aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2017-04-30 16:56:18 +0200
committerClément Lassieur <clement@lassieur.org>2017-05-03 21:41:47 +0200
commitdb88b5a85791d309e58cdd3e1f0ce5ecf8f2ce9b (patch)
tree366b61b6d0fe0262839755421f98ecc9abf38dea
parent21b99aade1bcaa3393bb1028324bd22265b3bf34 (diff)
downloadguix-db88b5a85791d309e58cdd3e1f0ce5ecf8f2ce9b.tar
guix-db88b5a85791d309e58cdd3e1f0ce5ecf8f2ce9b.tar.gz
gnu: gitolite: Avoid references to the store in authorized_keys.
* gnu/packages/version-control.scm (gitolite)[arguments]: Substitute '$glshell' with 'gitolite-shell' in ssh-authkeys.
-rw-r--r--gnu/packages/version-control.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e0770dc589..1cad0f2850 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -628,7 +628,13 @@ also walk each side of a merge and test those changes individually.")
;; invokes Perl.
(substitute* (find-files "." ".*")
((" perl -")
- (string-append " " perl " -"))))))
+ (string-append " " perl " -")))
+
+ ;; 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")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((output (assoc-ref outputs "out"))