From d17d1636b12f8ef0f8e5039bb78642b3df204657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 Aug 2013 17:46:07 +0200 Subject: [PATCH] Revert "Add /etc/ssl/certs/ca-certificates.crt symlink for Ubuntu compatibility" This reverts commit 10133f0b5b30e4d36a0c66742e1483d126d86f28. See discussion at https://github.com/NixOS/nixos/pull/224 --- modules/security/ca.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/security/ca.nix b/modules/security/ca.nix index 0fcfc446d420..e42f5ffe3b89 100644 --- a/modules/security/ca.nix +++ b/modules/security/ca.nix @@ -7,15 +7,8 @@ with pkgs.lib; config = { environment.etc = - [ - # Provide both Fedora and Ubuntu certificate locations for - # compatibility. - { source = "${pkgs.cacert}/etc/ca-bundle.crt"; - target = "ssl/certs/ca-bundle.crt"; # Same location as in Fedora - } - - { source = "${pkgs.cacert}/etc/ca-bundle.crt"; - target = "ssl/certs/ca-certificates.crt"; # Same location as in Ubuntu + [ { source = "${pkgs.cacert}/etc/ca-bundle.crt"; + target = "ssl/certs/ca-bundle.crt"; } # Backward compatibility; may remove at some point.