summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-08-13 22:28:01 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-08-13 22:40:43 +0200
commit6a66736f78f7d71bfc82f6761ffc8356bb9fc99d (patch)
tree073ea5aba4ba2f30eab618379f6450c2a429a8ef /modules
parentfix(nixos/git-server): Use correct regex syntax in allowed git config values (diff)
downloadnixos-server-6a66736f78f7d71bfc82f6761ffc8356bb9fc99d.tar.gz
nixos-server-6a66736f78f7d71bfc82f6761ffc8356bb9fc99d.zip
fix(nixos/git-server): Correctly enable the git config feature of gitolite
The previously set variable is only used in the gitolite.conf file for
the `config` specifications on each repo. We can't use that because we
use "wild-repos". Thus we need to add the `user-configs` option to each
repo, allow users to change the git settings specified there with a
simple `ssh git@git.vhack.eu config <repo> --set cgit.owner <name>`.
Diffstat (limited to '')
-rw-r--r--modules/nixos/vhack/git-server/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/nixos/vhack/git-server/default.nix b/modules/nixos/vhack/git-server/default.nix
index 2c1ac7e..83e18f8 100644
--- a/modules/nixos/vhack/git-server/default.nix
+++ b/modules/nixos/vhack/git-server/default.nix
@@ -75,7 +75,7 @@ in {
           $RC{UMASK} = 0027; # Enable group access, important for cgit.
 
           # Enable modifing git variables (for cgit.owner and such things)
-          $RC{GIT_CONFIG_KEYS} = 'cgit\.owner cgit\.desc cgit\.section cgit\.homepage gitweb\.owner gitweb\.description';
+          # These must be enable in the gitolite-admin repo (option user-configs = ...)
           push( @{$RC{ENABLE}}, 'config' );
           push( @{$RC{ENABLE}}, 'git-config' );
 
@@ -151,7 +151,8 @@ in {
 
           # NOTE: This allows cgit to take configuration from the bare git repositories:
           # eg. `cgit.section` should set the section, `cgit.homepage` the homepage,
-          # `gitweb.owner` the owner and `gitweb.description` the description of the repo. <2024-08-02>
+          # `cgit.owner` the owner and `cgit.description` the description of the repo (see
+          # cgitrc (5) for more). <2024-08-02>
           enable-git-config = true;
 
           # Remove the `.git` suffix from scanned repositories (this must be set _before_ `scan-path`)