diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-06 12:04:42 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-06 12:04:42 -0700 |
| commit | 9d6555dc0ae65fbed88e6163b79dc322ec46a767 (patch) | |
| tree | 2e1107a978bd3a1a09fca272ec8903f7ebe9110a /nixos/modules/security/ca.nix | |
| parent | 40b66f613181844dc48a8ef4b0d958687c2cfa31 (diff) | |
| parent | ee8825935f771d7c9c1a68a089b396995d683cc4 (diff) | |
| download | nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.tar nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.tar.gz nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.tar.bz2 nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.tar.lz nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.tar.xz nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.tar.zst nixlib-9d6555dc0ae65fbed88e6163b79dc322ec46a767.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos/modules/security/ca.nix')
| -rw-r--r-- | nixos/modules/security/ca.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index dec5a62dcf04..008ca1f6df52 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -22,7 +22,7 @@ in security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]"; + example = literalExample "[ \"\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt\" ]"; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form @@ -53,7 +53,7 @@ in config = { - security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ]; + 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; |