summary refs log tree commit diff
path: root/nixos/modules/system/boot/systemd.nix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2018-06-30 01:58:35 +0200
committerFlorian Klink <flokli@flokli.de>2018-06-30 03:02:58 +0200
commitfff5923686c21dd147bde62d08e9f1042deadb4f (patch)
treeb5d25982df0045672be210e75dd923ce432cf8de /nixos/modules/system/boot/systemd.nix
parent89d5d191b48c502c84a4ed459ef3c9adc77a012a (diff)
downloadnixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.gz
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.bz2
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.lz
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.xz
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.zst
nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.zip
nixos/modules: users.(extraUsers|extraGroup->users|group)
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
-rw-r--r--nixos/modules/system/boot/systemd.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d2fe33488a7a..6593b1a02430 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 =