From 350ebdf52a181666d268cdb8da13231e886f9306 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 26 Jan 2024 07:22:55 +0100 Subject: Configure channel server properly The channel must be served from a subdirectory, because if is configured to the shorter, cgit path, guix pull receives the website content instead of the git content. For good measure, explicitly declare the fcgiwrap service. I am not sure if it is actually needed in the code, but I do not have the time to test it properly right now. --- systems/izumi/izumi.org | 3 ++- systems/izumi/system-configuration.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org index 47c31b7..0ff44cc 100644 --- a/systems/izumi/izumi.org +++ b/systems/izumi/izumi.org @@ -567,7 +567,7 @@ ( git-http-nginx-location-configuration ( git-http-configuration ( git-root "/var/lib/gitolite/repositories" ) - ( uri-path "/" ) ) ) + ( uri-path "/git" ) ) ) ( nginx-location-configuration ( body ( list @@ -594,6 +594,7 @@ ( hide? #t ) ( path "/srv/git/marek/packages" ) ) ) ) ( repository-directory "/var/lib/gitolite/repositories" ) ) ) + ( service fcgiwrap-service-type ) ( service gitolite-service-type ( gitolite-configuration ( admin-pubkey gitolite-keys ) diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm index 8ef77e7..fba55bf 100644 --- a/systems/izumi/system-configuration.scm +++ b/systems/izumi/system-configuration.scm @@ -557,7 +557,7 @@ ( git-http-nginx-location-configuration ( git-http-configuration ( git-root "/var/lib/gitolite/repositories" ) - ( uri-path "/" ) ) ) + ( uri-path "/git" ) ) ) ( nginx-location-configuration ( body ( list @@ -584,6 +584,7 @@ ( hide? #t ) ( path "/srv/git/marek/packages" ) ) ) ) ( repository-directory "/var/lib/gitolite/repositories" ) ) ) + ( service fcgiwrap-service-type ) ( service gitolite-service-type ( gitolite-configuration ( admin-pubkey gitolite-keys ) -- cgit v1.2.3