From 7d69a82b55416bd708ac9f19b291eb24a241d97e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 19:06:27 +0000
Subject: [PATCH] * Put the CA certificate bundle in /etc/ssl/certs because Qt
 expects   them there.

svn path=/nixos/trunk/; revision=28009
---
 modules/security/ca.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index 4c7fe34389bc..0ac4f565bd6c 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
       '';
       
   };