diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-10 13:07:10 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-10 13:07:10 +0200 |
| commit | 8ae659f16c0f2706bd264ba3ee880f265a847438 (patch) | |
| tree | 4deed69afb88d9522207c8d5e9e39daa31bf3130 /nixos/modules/security/ca.nix | |
| parent | 491c088731022463978e595956427e72db6306a9 (diff) | |
| download | nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.tar nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.gz nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.bz2 nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.lz nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.xz nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.zst nixpkgs-8ae659f16c0f2706bd264ba3ee880f265a847438.zip | |
Revert "Revert "Merge #2692: Use pam_env to properly setup system-wide env""
This reverts commit 491c088731022463978e595956427e72db6306a9.
Diffstat (limited to 'nixos/modules/security/ca.nix')
| -rw-r--r-- | nixos/modules/security/ca.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index f159e359f96..57764dc870f 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,9 +12,11 @@ with lib; } ]; - 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"; + 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"; + }; }; |