commit 076bc9711a7155077c8cc2e9dc451ca4678f7df7
author Matthias Andreas Benkard <code@mail.matthias.benkard.de> Thu Nov 05 16:42:09 2026 +0100
committer Matthias Andreas Benkard <code@mail.matthias.benkard.de> Thu Nov 05 16:42:09 2026 +0100
tree d19c255b7d788cf4fc79658b4cceb8db969e9ac9
parent c5a939102931281951f3f9b8b740b99a1399c0eb

git: Keep the cgit image away from gitolite's ~/.ssh.

The image's sshd setup runs chown -R on $S6_USERHOME/.ssh, which was
gitolite's .ssh on the shared volume, and broke gitolite.  Give cgit's
user a home inside the container and set PUID to that user so its key
generation succeeds.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Change-Id: I67527fba73527fc71b87aac876ec1ea09860c76b

git/git.yaml

diff --git a/git/git.yaml b/git/git.yaml
index d85c605..da65908 100644
--- a/git/git.yaml
+++ b/git/git.yaml
@@ -37,6 +37,17 @@
               value: "true"
             - name: S6_USER
               value: ""
+            # The image's sshd setup runs `chown -R git ~/.ssh`, and
+            # /home/git/.ssh is gitolite's .ssh (same volume); give cgit's
+            # user a home inside the container instead.
+            - name: S6_USERHOME
+              value: /var/lib/cgit
+            # The setup then generates a key there as PUID; must match the
+            # image's git user (1001) that owns that directory.
+            - name: PUID
+              value: "1001"
+            - name: CGIT_REPODIR
+              value: /home/git/repositories
           resources:
             limits:
               cpu: 2000m