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/ca.nix | |
parent | 9265a61453f0df3a8bbaf3dc53e32c239e3bdcf9 (diff) | |
download | nixpkgs-491c088731022463978e595956427e72db6306a9.tar nixpkgs-491c088731022463978e595956427e72db6306a9.tar.gz nixpkgs-491c088731022463978e595956427e72db6306a9.tar.bz2 nixpkgs-491c088731022463978e595956427e72db6306a9.tar.lz nixpkgs-491c088731022463978e595956427e72db6306a9.tar.xz nixpkgs-491c088731022463978e595956427e72db6306a9.tar.zst nixpkgs-491c088731022463978e595956427e72db6306a9.zip |
Revert "Merge #2692: Use pam_env to properly setup system-wide env"
This reverts commit 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.
Diffstat (limited to 'nixos/modules/security/ca.nix')
-rw-r--r-- | nixos/modules/security/ca.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 57764dc870f..f159e359f96 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"; }; |