Author: eelco
Date: Fri Jul 29 19:06:27 2011
New Revision: 28009
URL: https://svn.nixos.org/websvn/nix/?rev=28009&sc=1
Log:
* Put the CA certificate bundle in /etc/ssl/certs because Qt expects
them there.
Modified:
nixos/trunk/modules/security/ca.nix
Modified: nixos/trunk/modules/security/ca.nix
==============================================================================
--- nixos/trunk/modules/security/ca.nix Fri Jul 29 19:05:52 2011 (r28008)
+++ nixos/trunk/modules/security/ca.nix Fri Jul 29 19:06:27 2011 (r28009)
@@ -6,15 +6,21 @@
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
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
