diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2019-09-14 19:51:29 +0200 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-06 10:39:18 -0500 |
| commit | 1d61efb7f177f7b70c467ab4940fde0a3481d4dc (patch) | |
| tree | 860cce85acd87bc07aa2d11f4feac5d0df48a5c0 /nixos/modules/security/duosec.nix | |
| parent | 6bd13ccd8e7fd1f241eb655f7112df1ed2889a3a (diff) | |
| download | nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.gz nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.bz2 nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.lz nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.xz nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.zst nixlib-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.zip | |
treewide: use attrs instead of list for types.loaOf options
Diffstat (limited to 'nixos/modules/security/duosec.nix')
| -rw-r--r-- | nixos/modules/security/duosec.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 997328ad9e6a..78a82b7154e7 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -25,19 +25,21 @@ let accept_env_factor=${boolToStr cfg.acceptEnvFactor} ''; - loginCfgFile = optional cfg.ssh.enable - { source = pkgs.writeText "login_duo.conf" configFileLogin; - mode = "0600"; - user = "sshd"; - target = "duo/login_duo.conf"; - }; + loginCfgFile = optionalAttrs cfg.ssh.enable { + "duo/login_duo.conf" = + { source = pkgs.writeText "login_duo.conf" configFileLogin; + mode = "0600"; + user = "sshd"; + }; + }; - pamCfgFile = optional cfg.pam.enable - { source = pkgs.writeText "pam_duo.conf" configFilePam; - mode = "0600"; - user = "sshd"; - target = "duo/pam_duo.conf"; - }; + pamCfgFile = optional cfg.pam.enable { + "duo/pam_duo.conf" = + { source = pkgs.writeText "pam_duo.conf" configFilePam; + mode = "0600"; + user = "sshd"; + }; + }; in { options = { @@ -186,7 +188,7 @@ in environment.systemPackages = [ pkgs.duo-unix ]; security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; - environment.etc = loginCfgFile ++ pamCfgFile; + environment.etc = loginCfgFile // pamCfgFile; /* If PAM *and* SSH are enabled, then don't do anything special. If PAM isn't used, set the default SSH-only options. */ |