diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-10 13:03:44 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-10 13:03:44 +0200 |
| commit | 491c088731022463978e595956427e72db6306a9 (patch) | |
| tree | 7b72dcd17ad081d12fbf24d39b0cd4c12a0651f2 /nixos/modules/security | |
| parent | 9265a61453f0df3a8bbaf3dc53e32c239e3bdcf9 (diff) | |
| download | nixlib-491c088731022463978e595956427e72db6306a9.tar nixlib-491c088731022463978e595956427e72db6306a9.tar.gz nixlib-491c088731022463978e595956427e72db6306a9.tar.bz2 nixlib-491c088731022463978e595956427e72db6306a9.tar.lz nixlib-491c088731022463978e595956427e72db6306a9.tar.xz nixlib-491c088731022463978e595956427e72db6306a9.tar.zst nixlib-491c088731022463978e595956427e72db6306a9.zip | |
Revert "Merge #2692: Use pam_env to properly setup system-wide env"
This reverts commit 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.
Diffstat (limited to 'nixos/modules/security')
| -rw-r--r-- | nixos/modules/security/ca.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/security/pam.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/security/sudo.nix | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 57764dc870f3..f159e359f968 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,11 +12,9 @@ with lib; } ]; - environment.systemVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; - GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; - }; + environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 02340fd78e8c..6a5eb4c720f8 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -186,7 +186,6 @@ let "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} # Session management. - session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so ${optionalString cfg.setLoginUid "session required pam_loginuid.so"} diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index e8ed545c8cc7..cce1e785563b 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -58,6 +58,9 @@ in # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead. # Environment variables to keep for root and %wheel. + Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE + Defaults:root,%wheel env_keep+=NIX_CONF_DIR + Defaults:root,%wheel env_keep+=NIX_PATH Defaults:root,%wheel env_keep+=TERMINFO_DIRS Defaults:root,%wheel env_keep+=TERMINFO |