From 1b7902bd291bd1dbdc0246b0572566bbe9ee4133 Mon Sep 17 00:00:00 2001 From: sophia Date: Fri, 26 Feb 2021 09:59:38 -0600 Subject: [PATCH 1/2] Get ssl certs --- substrate/run.sh | 2 +- substrate/vagrant-scripts/osx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/substrate/run.sh b/substrate/run.sh index 97d6a7eb..3fb4648e 100755 --- 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 index 2c4a5d1c..4bc52f42 100644 --- 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 From 995060fafcf2c62242a7014b0c245a5a4f219535 Mon Sep 17 00:00:00 2001 From: sophia Date: Fri, 26 Feb 2021 10:31:06 -0600 Subject: [PATCH 2/2] Make sure certs dir exists --- package/support/install_vagrant.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package/support/install_vagrant.sh b/package/support/install_vagrant.sh index 1ddba6c7..2c1ccd09 100755 --- 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"