diff options
| author | EuAndreh <eu@euandre.org> | 2022-11-28 15:40:56 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2022-11-28 15:40:58 -0300 |
| commit | e87db0e149b366c7ec6cb979491769537be1b0a6 (patch) | |
| tree | 088a8c21f0fd97bab4dfadde351997c7cb7130cb | |
| parent | Makefile: Add "public" as adependency to "dev-check" (diff) | |
| download | toph-e87db0e149b366c7ec6cb979491769537be1b0a6.tar.gz toph-e87db0e149b366c7ec6cb979491769537be1b0a6.tar.xz | |
src/infrastructure/guix/: Make uniform path for git:// and https:// access
Instead of having repositories served over the Git protocol differ from
when they are served via the Dumb HTTP protocol. Previously, nginx was
doing the URL rewriting, and
| -rw-r--r-- | src/infrastructure/guix/channels.scm | 2 | ||||
| -rw-r--r-- | src/infrastructure/guix/system.scm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/infrastructure/guix/channels.scm b/src/infrastructure/guix/channels.scm index 2483441..e5ccd6a 100644 --- a/src/infrastructure/guix/channels.scm +++ b/src/infrastructure/guix/channels.scm @@ -2,7 +2,7 @@ (list (channel (name 'org-euandre) - (url "git://euandre.org/package-repository") + (url "git://euandre.org/git/package-repository") (branch "main") (introduction (make-channel-introduction diff --git a/src/infrastructure/guix/system.scm b/src/infrastructure/guix/system.scm index 697d4c1..91d1940 100644 --- a/src/infrastructure/guix/system.scm +++ b/src/infrastructure/guix/system.scm @@ -1713,7 +1713,7 @@ (name "git") (group "git") (comment "Public Git user") - (home-directory "/srv/git") + (home-directory "/srv/git/git") (shell (file-append git "/bin/git-shell")))) %base-user-accounts)) (groups @@ -1782,6 +1782,7 @@ (nginx '()) (source-filter (file-append cgit "/lib/cgit/filters/syntax-highlighting.py")) (about-filter (file-append cgit "/lib/cgit/filters/about-formatting.sh")) + (repository-directory "/srv/git/git") (virtual-root "/git/") (remove-suffix? #t) (nocache? #t) |