diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-02 21:16:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-06-02 21:16:27 +0000 |
| commit | 0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea (patch) | |
| tree | e07ddb491b39c1251812e4b7e5e601638a378782 /modules/programs | |
| parent | c089738bdcff78a3bf75911665301f7a93a73ba9 (diff) | |
| download | nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.tar nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.tar.gz nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.tar.bz2 nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.tar.lz nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.tar.xz nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.tar.zst nixpkgs-0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea.zip | |
* Rename the `pwdutils' module to `shadow'.
svn path=/nixos/trunk/; revision=22109
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/pwdutils/login.defs | 18 | ||||
| -rw-r--r-- | modules/programs/shadow.nix (renamed from modules/programs/pwdutils/pwdutils.nix) | 24 |
2 files changed, 23 insertions, 19 deletions
diff --git a/modules/programs/pwdutils/login.defs b/modules/programs/pwdutils/login.defs deleted file mode 100644 index 9d789fe7805..00000000000 --- a/modules/programs/pwdutils/login.defs +++ /dev/null @@ -1,18 +0,0 @@ -DEFAULT_HOME yes - -SYS_UID_MIN 100 -SYS_UID_MAX 499 -UID_MIN 1000 -UID_MAX 29999 - -SYS_GID_MIN 100 -SYS_GID_MAX 499 -GID_MIN 1000 -GID_MAX 29999 - -TTYGROUP tty -TTYPERM 0620 - -# Uncomment this to allow non-root users to change their account -#information. This should be made configurable. -#CHFN_RESTRICT frwh diff --git a/modules/programs/pwdutils/pwdutils.nix b/modules/programs/shadow.nix index cb77a0e4346..711156918df 100644 --- a/modules/programs/pwdutils/pwdutils.nix +++ b/modules/programs/shadow.nix @@ -4,6 +4,28 @@ let + loginDefs = + '' + DEFAULT_HOME yes + + SYS_UID_MIN 100 + SYS_UID_MAX 499 + UID_MIN 1000 + UID_MAX 29999 + + SYS_GID_MIN 100 + SYS_GID_MAX 499 + GID_MIN 1000 + GID_MAX 29999 + + TTYGROUP tty + TTYPERM 0620 + + # Uncomment this to allow non-root users to change their account + #information. This should be made configurable. + #CHFN_RESTRICT frwh + ''; + in { @@ -35,7 +57,7 @@ in environment.etc = [ { # /etc/login.defs: global configuration for pwdutils. You # cannot login without it! - source = ./login.defs; + source = pkgs.writeText "login.defs" loginDefs; target = "login.defs"; } |