diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 17:10:32 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 17:10:32 -0600 |
| commit | 264db4e30936cbb4dd9f88123aafb42a5259e74f (patch) | |
| tree | 92b00c1bf0fdb8049cb85fbe1e710d6c5c1d286c /nixos/modules/security | |
| parent | f2f3f1479e18b530b57628c7d7725283afb57ac4 (diff) | |
Set merge + mkIf always surprises me
Diffstat (limited to 'nixos/modules/security')
| -rw-r--r-- | nixos/modules/security/pam.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/security/wrappers/default.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 711e4c55c7d59..3cc5db2fb9b30 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -478,10 +478,10 @@ in owner = "root"; setuid = true; }; - } // (mkIf config.security.pam.enableEcryptfs { + } // (if config.security.pam.enableEcryptfs then { "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; - }); + } else {}); environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 73b4cad868783..71799175011ca 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -152,6 +152,9 @@ in ###### implementation config = { + + security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount"; + # Make sure our wrapperDir exports to the PATH env variable when # initializing the shell environment.extraInit = '' |