nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/duosec: rename ikey option to integrationKey

Browse Source
This commit is contained in:
Aaron Andersen 2020-01-30 21:21:47 -05:00
parent b9dca769f1
commit 6f0c1cdbd9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -103,6 +103,10 @@
<link linkend="opt-security.duosec.secretKeyFile">security.duosec.secretKeyFile</link> <link linkend="opt-security.duosec.secretKeyFile">security.duosec.secretKeyFile</link>
option for better security. option for better security.
</para> </para>
<para>
<literal>security.duosec.ikey</literal> has been renamed to
<link linkend="opt-security.duosec.integrationKey">security.duosec.integrationKey</link>.
</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>

5
nixos/modules/security/duosec.nix
View File

@ -9,7 +9,7 @@ let
configFilePam = '' configFilePam = ''
[duo] [duo]
ikey=${cfg.ikey} ikey=${cfg.integrationKey}
host=${cfg.host} host=${cfg.host}
${optionalString (cfg.groups != "") ("groups="+cfg.groups)} ${optionalString (cfg.groups != "") ("groups="+cfg.groups)}
failmode=${cfg.failmode} failmode=${cfg.failmode}
@ -27,6 +27,7 @@ in
{ {
imports = [ imports = [
(mkRenamedOptionModule [ "security" "duosec" "group" ] [ "security" "duosec" "groups" ]) (mkRenamedOptionModule [ "security" "duosec" "group" ] [ "security" "duosec" "groups" ])
(mkRenamedOptionModule [ "security" "duosec" "ikey" ] [ "security" "duosec" "integrationKey" ])
(mkRemovedOptionModule [ "security" "duosec" "skey" ] "The insecure security.duosec.skey option has been replaced by a new security.duosec.secretKeyFile option. Use this new option to store a secure copy of your key instead.") (mkRemovedOptionModule [ "security" "duosec" "skey" ] "The insecure security.duosec.skey option has been replaced by a new security.duosec.secretKeyFile option. Use this new option to store a secure copy of your key instead.")
]; ];
@ -44,7 +45,7 @@ in
description = "If enabled, protect logins with Duo Security using PAM support."; description = "If enabled, protect logins with Duo Security using PAM support.";
}; };
ikey = mkOption { integrationKey = mkOption {
type = types.str; type = types.str;
description = "Integration key."; description = "Integration key.";
}; };