0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00

nixos/modules: users.(extraUsers|extraGroup->users|group)

This commit is contained in:
Florian Klink 2018-06-30 01:58:35 +02:00
parent 89d5d191b4
commit fff5923686
295 changed files with 512 additions and 512 deletions

View file

@ -332,13 +332,13 @@ in
in
generators.toINI {} totalConfig;
users.extraUsers = singleton {
users.users = singleton {
name = "ceph";
uid = config.ids.uids.ceph;
description = "Ceph daemon user";
};
users.extraGroups = singleton {
users.groups = singleton {
name = "ceph";
gid = config.ids.gids.ceph;
};

View file

@ -57,12 +57,12 @@ in
environment.systemPackages = [ pkgs.davfs2 ];
environment.etc."davfs2/davfs2.conf".source = cfgFile;
users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton {
users.groups = optionalAttrs (cfg.davGroup == "davfs2") (singleton {
name = "davfs2";
gid = config.ids.gids.davfs2;
});
users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton {
users.users = optionalAttrs (cfg.davUser == "davfs2") (singleton {
name = "davfs2";
createHome = false;
group = cfg.davGroup;

View file

@ -212,7 +212,7 @@ in {
user_allow_other
''; };
users.extraUsers = mkIf (cfg.user == "ipfs") {
users.users = mkIf (cfg.user == "ipfs") {
ipfs = {
group = cfg.group;
home = cfg.dataDir;
@ -222,7 +222,7 @@ in {
};
};
users.extraGroups = mkIf (cfg.group == "ipfs") {
users.groups = mkIf (cfg.group == "ipfs") {
ipfs.gid = config.ids.gids.ipfs;
};

View file

@ -255,7 +255,7 @@ in
cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
'';
});
users.extraUsers = flip mapAttrs' cfg.introducers (node: _:
users.users = flip mapAttrs' cfg.introducers (node: _:
nameValuePair "tahoe.introducer-${node}" {
description = "Tahoe node user for introducer ${node}";
isSystemUser = true;
@ -355,7 +355,7 @@ in
cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
'';
});
users.extraUsers = flip mapAttrs' cfg.nodes (node: _:
users.users = flip mapAttrs' cfg.nodes (node: _:
nameValuePair "tahoe.${node}" {
description = "Tahoe node user for node ${node}";
isSystemUser = true;

View file

@ -432,14 +432,14 @@ in
environment.systemPackages = [ xtreemfs ];
users.extraUsers.xtreemfs =
users.users.xtreemfs =
{ uid = config.ids.uids.xtreemfs;
description = "XtreemFS user";
createHome = true;
home = home;
};
users.extraGroups.xtreemfs =
users.groups.xtreemfs =
{ gid = config.ids.gids.xtreemfs;
};

View file

@ -73,7 +73,7 @@ in
config = mkIf cfg.enable {
users.extraUsers = mkIf (cfg.user == null) [ {
users.users = mkIf (cfg.user == null) [ {
name = u;
uid = config.ids.uids.yandexdisk;
group = "nogroup";