summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorBrian Bennett <brian.bennett@joyent.com>2019-08-14 06:25:09 -0700
committerBrian Bennett <brian.bennett@joyent.com>2019-08-14 06:25:09 -0700
commit8d38846690a3922081ad4c8a4fb3c4faf4d8016b (patch)
treee30bb45dbf0b01f33022b33b9d3d964e171ade54 /usr/src
parenta60d73059a77dc119c8a4472413380ddbac8cef5 (diff)
downloadillumos-joyent-8d38846690a3922081ad4c8a4fb3c4faf4d8016b.tar.gz
OS-7911 root's .profile should use pkgsrc mozilla-rootcerts, if available
Reviewed by: John Levon <john.levon@joyent.com> Approved by: John Levon <john.levon@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/nsadmin/dot-profile.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr/src/cmd/nsadmin/dot-profile.sh b/usr/src/cmd/nsadmin/dot-profile.sh
index 906d43bae5..fa6fb19714 100644
--- a/usr/src/cmd/nsadmin/dot-profile.sh
+++ b/usr/src/cmd/nsadmin/dot-profile.sh
@@ -5,10 +5,15 @@
#
#
-# Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
#
PATH=/usr/bin:/usr/sbin:/smartdc/bin:/opt/smartdc/bin:/opt/local/bin:/opt/local/sbin:/opt/tools/bin:/opt/tools/sbin:/opt/smartdc/agents/bin
MANPATH=/usr/share/man:/smartdc/man:/opt/smartdc/man:/opt/local/man:/opt/tools/man
PAGER=less
-export PATH MANPATH PAGER
+# If pkgsrc-tools is set up and the mozilla-rootcerts package is installed
+# configure the platform curl to use it.
+if [[ -f /opt/tools/share/mozilla-rootcerts/cacert.pem ]]; then
+ CURL_CA_BUNDLE=/opt/tools/share/mozilla-rootcerts/cacert.pem
+fi
+export PATH MANPATH PAGER CURL_CA_BUNDLE