summary refs log tree commit diff
path: root/nixos/modules/security/ca.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-29 02:32:05 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-29 02:32:05 +0100
commitbfebc7342e42ebe7a57c9e21b11ab19579189bfd (patch)
tree06785aa8f52b73a28e94b3ea04a954a2c2deb25b /nixos/modules/security/ca.nix
parent7d2eb0c4abe9ea33def49bf33526670667525d27 (diff)
downloadnixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.tar
nixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.tar.gz
nixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.tar.bz2
nixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.tar.lz
nixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.tar.xz
nixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.tar.zst
nixpkgs-bfebc7342e42ebe7a57c9e21b11ab19579189bfd.zip
Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt
Diffstat (limited to 'nixos/modules/security/ca.nix')
-rw-r--r--nixos/modules/security/ca.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index ddfad52d42e..98d73ed2542 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  caBundle = pkgs.runCommand "ca-bundle.crt"
+  caCertificates = pkgs.runCommand "ca-certificates.crt"
     { files =
         config.security.pki.certificateFiles ++
         [ (builtins.toFile "extra.crt" (concatStringsSep "\n" config.security.pki.certificates)) ];
@@ -26,7 +26,7 @@ in
       description = ''
         A list of files containing trusted root certificates in PEM
         format. These are concatenated to form
-        <filename>/etc/ssl/certs/ca-bundle.crt</filename>, which is
+        <filename>/etc/ssl/certs/ca-certificates.crt</filename>, which is
         used by many programs that use OpenSSL, such as
         <command>curl</command> and <command>git</command>.
       '';
@@ -56,13 +56,13 @@ in
     security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
 
     # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
-    environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;
+    environment.etc."ssl/certs/ca-certificates.crt".source = caCertificates;
 
     # Old NixOS compatibility.
-    environment.etc."ssl/certs/ca-bundle.crt".source = caBundle;
+    environment.etc."ssl/certs/ca-bundle.crt".source = caCertificates;
 
     # CentOS/Fedora compatibility.
-    environment.etc."pki/tls/certs/ca-bundle.crt".source = caBundle;
+    environment.etc."pki/tls/certs/ca-bundle.crt".source = caCertificates;
 
     environment.sessionVariables =
       { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";