1 files changed, 11 insertions, 2 deletions
diff --git a/ymir.nix b/ymir.nix
index 91604105..ac8c696c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -411,9 +411,18 @@ in rec {
    enable = true;
    adminPubkey = builtins.readFile (builtins.head (import ./users/gkleen.nix).openssh.authorizedKeys.keyFiles);
    dataDir = "/srv/git";
-  };
+    user = "gitolite";
-  users.extraUsers."gitolite" = {
    group = "git";
+    extraGitoliteRc = ''
+      $RC{UMASK} = 0027;
+      $RC{GIT_CONFIG_KEYS} = 'gitweb\.(owner|description|category)';
+      $RC{LOG_DEST} = 'syslog';
+      $RC{ROLES}{AUTHORS} = 1;
+      $RC{GROUPLIST_PGM} = 'printf "@self-key-managers"';
+      $RC{HOSTNAME} = '${networking.hostName}';
+      $RC{LOCAL_CODE} = "$rc{GL_ADMIN_BASE}/local";
+      push(@{$RC{ENABLE}}, qw(create fork D cgit repo-specific-hooks macros));
+    '';
  };
  services.gitDaemon = {

diff --git a/ymir.nix b/ymir.nix index 91604105..ac8c696c 100644 --- a/ymir.nix +++ b/ymir.nix
@@ -411,9 +411,18 @@ in rec {
411	enable = true;	411	enable = true;
412	adminPubkey = builtins.readFile (builtins.head (import ./users/gkleen.nix).openssh.authorizedKeys.keyFiles);	412	adminPubkey = builtins.readFile (builtins.head (import ./users/gkleen.nix).openssh.authorizedKeys.keyFiles);
413	dataDir = "/srv/git";	413	dataDir = "/srv/git";
414	};	414	user = "gitolite";
415	users.extraUsers."gitolite" = {
416	group = "git";	415	group = "git";
		416	extraGitoliteRc = ''
		417	$RC{UMASK} = 0027;
		418	$RC{GIT_CONFIG_KEYS} = 'gitweb\.(owner\|description\|category)';
		419	$RC{LOG_DEST} = 'syslog';
		420	$RC{ROLES}{AUTHORS} = 1;
		421	$RC{GROUPLIST_PGM} = 'printf "@self-key-managers"';
		422	$RC{HOSTNAME} = '${networking.hostName}';
		423	$RC{LOCAL_CODE} = "$rc{GL_ADMIN_BASE}/local";
		424	push(@{$RC{ENABLE}}, qw(create fork D cgit repo-specific-hooks macros));
		425	'';
417	};	426	};
418		427
419	services.gitDaemon = {	428	services.gitDaemon = {