diff options
author | Florian Klink <flokli@flokli.de> | 2018-06-30 01:58:35 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2018-06-30 03:02:58 +0200 |
commit | fff5923686c21dd147bde62d08e9f1042deadb4f (patch) | |
tree | b5d25982df0045672be210e75dd923ce432cf8de /nixos/modules/system/boot | |
parent | 89d5d191b48c502c84a4ed459ef3c9adc77a012a (diff) | |
download | nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.gz nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.bz2 nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.lz nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.xz nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.zst nixpkgs-fff5923686c21dd147bde62d08e9f1042deadb4f.zip |
nixos/modules: users.(extraUsers|extraGroup->users|group)
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r-- | nixos/modules/system/boot/initrd-ssh.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/systemd.nix | 16 | ||||
-rw-r--r-- | nixos/modules/system/boot/timesyncd.nix | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 8b3dc2d90eb..53e993603e2 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -79,7 +79,7 @@ in boot.initrd.network.ssh.authorizedKeys = mkOption { type = types.listOf types.str; - default = config.users.extraUsers.root.openssh.authorizedKeys.keys; + default = config.users.users.root.openssh.authorizedKeys.keys; description = '' Authorized keys for the root user on initrd. ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d2fe33488a7..6593b1a0243 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -798,13 +798,13 @@ in mkdir -m 0700 -p /var/log/journal ''; - users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; - users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network; - users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve; - users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve; + users.users.systemd-network.uid = config.ids.uids.systemd-network; + users.groups.systemd-network.gid = config.ids.gids.systemd-network; + users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; + users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve; # Target for ‘charon send-keys’ to hook into. - users.extraGroups.keys.gid = config.ids.gids.keys; + users.groups.keys.gid = config.ids.gids.keys; systemd.targets.keys = { description = "Security Keys"; @@ -840,9 +840,9 @@ in "TMPFS_XATTR" "SECCOMP" ]; - users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal; - users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; - users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; + users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; + users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; # Generate timer units for all services that have a ‘startAt’ value. systemd.timers = diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 57853c5698d..18aad58b36c 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -37,8 +37,8 @@ with lib; NTP=${concatStringsSep " " config.services.timesyncd.servers} ''; - users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync; - users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync; + users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync; + users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; }; |