diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-07-02 11:23:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-02 11:23:10 +0000 |
commit | b43c4d8b758a3965067b24f3796cdd532756a2ce (patch) | |
tree | 477818fa0c7bfb1d9dbbdf3197472a7856de8ed9 /nixos/modules/services/continuous-integration/buildbot | |
parent | 24ef1450bd5616bf8f48598cedaaf53039665464 (diff) | |
parent | fff5923686c21dd147bde62d08e9f1042deadb4f (diff) | |
download | nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.tar nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.tar.gz nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.tar.bz2 nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.tar.lz nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.tar.xz nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.tar.zst nixlib-b43c4d8b758a3965067b24f3796cdd532756a2ce.zip |
Merge pull request #42798 from flokli/users-users
tree-wide: users.extraUsers -> users.users, users.extraGroups -> users.groups
Diffstat (limited to 'nixos/modules/services/continuous-integration/buildbot')
-rw-r--r-- | nixos/modules/services/continuous-integration/buildbot/master.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/continuous-integration/buildbot/worker.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 846efc8b5b9a..8d767de37f00 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -191,11 +191,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "buildbot") { + users.groups = optional (cfg.group == "buildbot") { name = "buildbot"; }; - users.extraUsers = optional (cfg.user == "buildbot") { + users.users = optional (cfg.user == "buildbot") { name = "buildbot"; description = "Buildbot User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index a97f571e89df..67c541570b97 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -84,11 +84,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "bbworker") { + users.groups = optional (cfg.group == "bbworker") { name = "bbworker"; }; - users.extraUsers = optional (cfg.user == "bbworker") { + users.users = optional (cfg.user == "bbworker") { name = "bbworker"; description = "Buildbot Worker User."; isNormalUser = true; |