public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: use types.enum instead of ad-hoc check in sshd service

Browse Source
This commit is contained in:
Jan Malakhovski 2015-03-19 16:03:09 +00:00
parent dc4fa2da8a
commit 5c6d86540b
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -9,12 +9,6 @@ let
nssModulesPath = config.system.nssModules.path; nssModulesPath = config.system.nssModules.path;
permitRootLoginCheck = v:
v == "yes" ||
v == "without-password" ||
v == "forced-commands-only" ||
v == "no";
knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
knownHostsText = flip (concatMapStringsSep "\n") knownHosts knownHostsText = flip (concatMapStringsSep "\n") knownHosts
@ -116,12 +110,9 @@ in
permitRootLogin = mkOption { permitRootLogin = mkOption {
default = "without-password"; default = "without-password";
type = types.addCheck types.str permitRootLoginCheck; type = types.enum ["yes" "without-password" "forced-commands-only" "no"];
description = '' description = ''
Whether the root user can login using ssh. Valid values are Whether the root user can login using ssh.
<literal>yes</literal>, <literal>without-password</literal>,
<literal>forced-commands-only</literal> or
<literal>no</literal>.
''; '';
}; };