diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
commit | de0af30716493d647e369f434008a67999ed9e28 (patch) | |
tree | 2fda05ead70be669e4325e0d661aaafd5d04d3c0 /nixos/modules/security/ca.nix | |
parent | 2ecb6b4574399cf710f09061357ae59526743a05 (diff) | |
parent | 4f8f5732fc1a24329cbe5f7eb9dcb7599e282a0c (diff) | |
download | nixlib-de0af30716493d647e369f434008a67999ed9e28.tar nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.gz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.bz2 nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.lz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.xz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.zst nixlib-de0af30716493d647e369f434008a67999ed9e28.zip |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/security/ca.nix')
-rw-r--r-- | nixos/modules/security/ca.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index ddfad52d42ed..98d73ed25426 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"; |