diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 19:06:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 19:09:32 +0200 |
| commit | 36f99a9a826a9b113aab8eb4e5ad267e4d87b84e (patch) | |
| tree | 169b74c6f75a586911e1d5f6dd7b1690783da3e5 /nixos/modules/security/ca.nix | |
| parent | 4a108847afb177305edb8375dbd3908c99369599 (diff) | |
| download | nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.tar nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.tar.gz nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.tar.bz2 nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.tar.lz nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.tar.xz nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.tar.zst nixpkgs-36f99a9a826a9b113aab8eb4e5ad267e4d87b84e.zip | |
Set $SSL_CERT_FILE
It's more standard than $OPENSSL_X509_CERT_FILE (which I guess was a totally unnecessary patch to OpenSSL). Since curl respects $SSL_CERT_FILE, it's no longer needed to set $CURL_CA_BUNDLE. Git unfortunately doesn't.
Diffstat (limited to 'nixos/modules/security/ca.nix')
| -rw-r--r-- | nixos/modules/security/ca.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index dd4b0c529e5..8e653cd4284 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -13,8 +13,9 @@ with lib; ]; environment.sessionVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + { SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + # FIXME: unneeded - remove eventually. + OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; |