summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-09-12 11:31:29 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-09-23 16:33:52 +0200
commit3a58e41e43a80f986b1613f7db878e130d8e5d1c (patch)
tree51b945d39f94d9f472ea2d0f7fd4c6002ad7723f /nixos
parentfc2c9949919b3053b9983fa3b6d8e337c5acff5b (diff)
downloadnixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.tar
nixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.tar.gz
nixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.tar.bz2
nixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.tar.lz
nixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.tar.xz
nixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.tar.zst
nixlib-3a58e41e43a80f986b1613f7db878e130d8e5d1c.zip
nixos/gitolite: use group 'gitolite' instead of 'nogroup'
Having files (git repositories) owned by 'nogroup' is a bad idea.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/misc/ids.nix2
-rw-r--r--nixos/modules/services/misc/gitolite.nix10
2 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0f3b8bcab8b0..508a76d3cab5 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -426,7 +426,7 @@
       teamspeak = 124;
       influxdb = 125;
       nsd = 126;
-      #gitolite = 127; # unused
+      gitolite = 127;
       znc = 128;
       polipo = 129;
       mopidy = 130;
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index d803a4e0bf12..6bb8adeccf79 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -85,6 +85,14 @@ in
           Gitolite user account. This is the username of the gitolite endpoint.
         '';
       };
+
+      group = mkOption {
+        type = types.str;
+        default = "gitolite";
+        description = ''
+          Primary group of the Gitolite user account.
+        '';
+      };
     };
   };
 
@@ -121,8 +129,10 @@ in
       home            = cfg.dataDir;
       createHome      = true;
       uid             = config.ids.uids.gitolite;
+      group           = cfg.group;
       useDefaultShell = true;
     };
+    users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite;
 
     systemd.services."gitolite-init" = {
       description = "Gitolite initialization";