diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
commit | 585983bc954d043d40a14b29c0bddca42bb9cdfb (patch) | |
tree | f64c271969e6fa21b7e3e49da7653a92f2d6face /nixos/doc/manual | |
parent | ff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee (diff) | |
parent | a71744392b6964e624d3ae968bee660731b7d271 (diff) | |
download | nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.gz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.bz2 nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.lz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.xz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.zst nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.zip |
Merge remote-tracking branch 'origin/staging'
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r-- | nixos/doc/manual/configuration/user-mgmt.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 40dc687d03bb..40362fbbb23f 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -13,11 +13,10 @@ states that a user account named <literal>alice</literal> shall exist: <programlisting> users.extraUsers.alice = - { createHome = true; + { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; extraGroups = [ "wheel" "networkmanager" ]; - useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; </programlisting> @@ -58,11 +57,6 @@ users.extraGroups.students.gid = 1000; As with users, the group ID (gid) is optional and will be assigned automatically if it’s missing.</para> -<warning><para>Currently declarative user management is not perfect: -<command>nixos-rebuild</command> does not know how to realise certain -configuration changes. This includes removing a user or group, and -removing group membership from a user.</para></warning> - <para>In the imperative style, users and groups are managed by commands such as <command>useradd</command>, <command>groupmod</command> and so on. For instance, to create a user |