0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +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

@ -658,14 +658,14 @@ in
warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton
users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
{ name = "wwwrun";
group = mainCfg.group;
description = "Apache httpd user";
uid = config.ids.uids.wwwrun;
});
users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton
users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton
{ name = "wwwrun";
gid = config.ids.gids.wwwrun;
});

View file

@ -93,13 +93,13 @@ in {
};
};
users.extraUsers.caddy = {
users.users.caddy = {
group = "caddy";
uid = config.ids.uids.caddy;
home = cfg.dataDir;
createHome = true;
};
users.extraGroups.caddy.gid = config.ids.uids.caddy;
users.groups.caddy.gid = config.ids.uids.caddy;
};
}

View file

@ -102,7 +102,7 @@ with lib;
environment.systemPackages = [ pkgs.hitch ];
users.extraUsers.hitch.group = "hitch";
users.extraGroups.hitch = {};
users.users.hitch.group = "hitch";
users.groups.hitch = {};
};
}

View file

@ -245,12 +245,12 @@ in
serviceConfig.KillSignal = "SIGINT";
};
users.extraUsers.lighttpd = {
users.users.lighttpd = {
group = "lighttpd";
description = "lighttpd web server privilege separation user";
uid = config.ids.uids.lighttpd;
};
users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd;
users.groups.lighttpd.gid = config.ids.gids.lighttpd;
};
}

View file

@ -194,7 +194,7 @@ in
storageDriver = mkDefault "overlay";
};
users.extraUsers."lighttpd".extraGroups = [ "docker" ];
users.users."lighttpd".extraGroups = [ "docker" ];
# Ensure that docker has pulled the required images.
systemd.services.inginious-prefetch = {

View file

@ -139,7 +139,7 @@ in
};
users = {
extraUsers.meguca = {
users.meguca = {
description = "meguca server service user";
home = cfg.baseDir;
createHome = true;
@ -147,7 +147,7 @@ in
uid = config.ids.uids.meguca;
};
extraGroups.meguca = {
groups.meguca = {
gid = config.ids.gids.meguca;
members = [ "meguca" ];
};

View file

@ -119,13 +119,13 @@ in {
};
};
users.extraUsers.mighttpd2 = {
users.users.mighttpd2 = {
group = "mighttpd2";
uid = config.ids.uids.mighttpd2;
isSystemUser = true;
};
users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2;
users.groups.mighttpd2.gid = config.ids.gids.mighttpd2;
};
meta.maintainers = with lib.maintainers; [ fgaz ];

View file

@ -101,11 +101,11 @@ in
};
};
users.extraUsers.minio = {
users.users.minio = {
group = "minio";
uid = config.ids.uids.minio;
};
users.extraGroups.minio.gid = config.ids.uids.minio;
users.groups.minio.gid = config.ids.uids.minio;
};
}

View file

@ -613,13 +613,13 @@ in
listToAttrs acmePairs
);
users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton
users.users = optionalAttrs (cfg.user == "nginx") (singleton
{ name = "nginx";
group = cfg.group;
uid = config.ids.uids.nginx;
});
users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton
users.groups = optionalAttrs (cfg.group == "nginx") (singleton
{ name = "nginx";
gid = config.ids.gids.nginx;
});

View file

@ -166,12 +166,12 @@ in
config = mkIf config.services.tomcat.enable {
users.extraGroups = singleton
users.groups = singleton
{ name = "tomcat";
gid = config.ids.gids.tomcat;
};
users.extraUsers = singleton
users.users = singleton
{ name = "tomcat";
uid = config.ids.uids.tomcat;
description = "Tomcat user";

View file

@ -114,12 +114,12 @@ in {
};
};
users.extraUsers.traefik = {
users.users.traefik = {
group = "traefik";
home = cfg.dataDir;
createHome = true;
};
users.extraGroups.traefik = {};
users.groups.traefik = {};
};
}

View file

@ -150,13 +150,13 @@ in {
};
};
users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton
users.users = optionalAttrs (cfg.user == "uwsgi") (singleton
{ name = "uwsgi";
group = cfg.group;
uid = config.ids.uids.uwsgi;
});
users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton
users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton
{ name = "uwsgi";
gid = config.ids.gids.uwsgi;
});

View file

@ -103,11 +103,11 @@ in
})
];
users.extraUsers.varnish = {
users.users.varnish = {
group = "varnish";
uid = config.ids.uids.varnish;
};
users.extraGroups.varnish.gid = config.ids.uids.varnish;
users.groups.varnish.gid = config.ids.uids.varnish;
};
}

View file

@ -103,7 +103,7 @@ in
config = mkIf (cfg.instances != {}) {
users.extraUsers.zope2.uid = config.ids.uids.zope2;
users.users.zope2.uid = config.ids.uids.zope2;
systemd.services =
let