diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-08T09·40+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-08T09·40+0200 |
| commit | bf8cc4e9b623408923e1b93e982fa692999b4124 (patch) | |
| tree | a4d0cadfd68e97780e539c704a63fd71c3ba8361 /scripts | |
| parent | 7d148ad543faa6b1b44193d014c29afe0705ad6a (diff) | |
Update cacert locations
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install-nix-from-closure.sh | 2 | ||||
| -rw-r--r-- | scripts/nix-profile.sh.in | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh index a1d8608e4058..3efe7b38435e 100644 --- a/scripts/install-nix-from-closure.sh +++ b/scripts/install-nix-from-closure.sh @@ -75,7 +75,7 @@ fi # Install an SSL certificate bundle. if [ -z "$SSL_CERT_FILE" -o ! -f "$SSL_CERT_FILE" ]; then $nix/bin/nix-env -i "$cacert" - export SSL_CERT_FILE="$HOME/.nix-profile/etc/ca-bundle.crt" + export SSL_CERT_FILE="$HOME/.nix-profile/etc/ssl/certs/ca-bundle.crt" fi # Subscribe the user to the Nixpkgs channel and fetch it. diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index eb34fcd75129..f772d2f711f3 100644 --- a/scripts/nix-profile.sh.in +++ b/scripts/nix-profile.sh.in @@ -22,11 +22,15 @@ if [ -n "$HOME" ]; then export NIX_PATH=${NIX_PATH:+$NIX_PATH:}nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs # Set $SSL_CERT_FILE so that Nixpkgs applications like curl work. - if [ -e /etc/ssl/certs/ca-bundle.crt ]; then # Fedora, NixOS - export SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt - elif [ -e /etc/ssl/certs/ca-certificates.crt ]; then # Ubuntu, Debian + if [ -e /etc/ssl/certs/ca-certificates.crt ]; then # NixOS, Ubuntu, Debian, Gentoo, Arch export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt - elif [ -e "$NIX_LINK/etc/ca-bundle.crt" ]; then # fall back to Nix profile + elif [ -e /etc/ssl/certs/ca-bundle.crt ]; then # Old NixOS + export SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt + elif [ -e /etc/pki/tls/certs/ca-bundle.crt ]; then # Fedora, CentOS + export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt + elif [ -e "$NIX_LINK/etc/ssl/certs/ca-bundle.crt" ]; then # fall back to cacert in Nix profile + export SSL_CERT_FILE="$NIX_LINK/etc/ssl/certs/ca-bundle.crt" + elif [ -e "$NIX_LINK/etc/ca-bundle.crt" ]; then # old cacert in Nix profile export SSL_CERT_FILE="$NIX_LINK/etc/ca-bundle.crt" fi fi |