refactor(tente): define gitolite user in main module

2 files changed, 10 insertions, 2 deletions

diff --git a/nixos/hosts/tente/default.nix b/nixos/hosts/tente/default.nix
index 749f468..ddfa89b 100644
--- a/nixos/hosts/tente/default.nix
+++ b/nixos/hosts/tente/default.nix
@@ -89,6 +89,8 @@ in
 
   gitolite = {
     dataDir = gitoliteDataDir;
+    user = "git";
+    group = "git";
   };
 
   grafana = {
diff --git a/nixos/hosts/tente/gitolite.nix b/nixos/hosts/tente/gitolite.nix
index c9a7fae..b7fba1a 100644
--- a/nixos/hosts/tente/gitolite.nix
+++ b/nixos/hosts/tente/gitolite.nix
@@ -5,6 +5,12 @@ let
 in
 {
   options.gitolite = {
+    user = lib.mkOption {
+      type = lib.types.str;
+    };
+    group = lib.mkOption {
+      type = lib.types.str;
+    };
     dataDir = lib.mkOption {
       type = lib.types.str;
     };
@@ -14,8 +20,8 @@ in
     services.gitolite = {
       enable = true;
       adminPubkey = ""; # TODO: submit PR to nixpkgs to make this option optional
-      user = "git";
-      group = "git";
+      user = cfg.user;
+      group = cfg.group;
       dataDir = cfg.dataDir;
       extraGitoliteRc = ''
         $RC{UMASK} = 0027;