diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-29 19:06:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-29 19:06:27 +0000 |
| commit | 7d69a82b55416bd708ac9f19b291eb24a241d97e (patch) | |
| tree | 0899583928e5b50e4d07cb134ae51edf0c4953d5 /modules/security | |
| parent | d0ad79958256512b96309f993b945cbf6e5e47e1 (diff) | |
| download | nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.tar nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.tar.gz nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.tar.bz2 nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.tar.lz nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.tar.xz nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.tar.zst nixpkgs-7d69a82b55416bd708ac9f19b291eb24a241d97e.zip | |
* Put the CA certificate bundle in /etc/ssl/certs because Qt expects
them there. svn path=/nixos/trunk/; revision=28009
Diffstat (limited to 'modules/security')
| -rw-r--r-- | modules/security/ca.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/modules/security/ca.nix b/modules/security/ca.nix index 4c7fe34389b..0ac4f565bd6 100644 --- a/modules/security/ca.nix +++ b/modules/security/ca.nix @@ -6,15 +6,21 @@ with pkgs.lib; config = { - environment.etc = singleton - { source = "${pkgs.cacert}/etc/ca-bundle.crt"; - target = "ca-bundle.crt"; - }; + environment.etc = + [ { source = "${pkgs.cacert}/etc/ca-bundle.crt"; + target = "ssl/certs/ca-bundle.crt"; + } + + # Backward compatibility; may remove at some point. + { source = "${pkgs.cacert}/etc/ca-bundle.crt"; + target = "ca-bundle.crt"; + } + ]; environment.shellInit = '' - export CURL_CA_BUNDLE=/etc/ca-bundle.crt - export GIT_SSL_CAINFO=/etc/ca-bundle.crt + export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt + export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt ''; }; |