Merge pull request #189 from hashicorp/ssl-cert-download

Ssl cert download
hashicorp · Feb 26, 2021 · 15d31a4 · 15d31a4
2 parents dacb5c2 + 995060f
commit 15d31a4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/package/support/install_vagrant.sh b/package/support/install_vagrant.sh
@@ -88,6 +88,7 @@ export PATH="${EMBEDDED_DIR}/bin:${PATH}"
 export SSL_CERT_FILE="${EMBEDDED_DIR}/cacert.pem"
 export PKG_CONFIG_PATH="${EMBEDDED_DIR}/lib/pkgconfig"
 
+mkdir -p "${EMBEDDED_DIR}/certs"
 # Install the pkg-config gem to ensure system can read the bundled *.pc files
 ${GEM_COMMAND} install pkg-config --no-document -v "~> 1.1.7"
 

diff --git a/substrate/run.sh b/substrate/run.sh
@@ -481,7 +481,7 @@ cp /vagrant/substrate/common/gemrc "${embed_dir}/etc/gemrc"
 
 # cacert
 echo_stderr " -> Writing cacert.pem..."
-curl -s --time-cond /vagrant/cacert.pem -o /vagrant/cacert.pem https://curl.haxx.se/ca/cacert.pem
+curl -s --time-cond /vagrant/cacert.pem -o /vagrant/cacert.pem https://curl.se/ca/cacert.pem
 cp /vagrant/cacert.pem "${embed_dir}/cacert.pem"
 
 # rubyencoder

diff --git a/substrate/vagrant-scripts/osx.sh b/substrate/vagrant-scripts/osx.sh
@@ -9,7 +9,7 @@ su vagrant -l -c 'brew update'
 su vagrant -l -c 'brew install wget'
 
 # grab new cacert
-curl -o cacert.pem https://curl.haxx.se/ca/cacert.pem
+curl -o cacert.pem https://curl.se/ca/cacert.pem
 mkdir -p /usr/local/etc/openssl
 chown vagrant:admin /usr/local/etc/openssl