From cc3a2c7021f06e8fc2b522cd7daca37cbc8b8c78 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Tue, 29 Nov 2016 12:36:56 +0200 Subject: [PATCH] Debian and Ubuntu: install TLS certs before cloning git repo via https --- bootstrap-salt.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 23b38c3..a6b42f0 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2498,7 +2498,15 @@ install_ubuntu_daily_deps() { install_ubuntu_git_deps() { apt-get update - __apt_get_install_noinput git-core || return 1 + + if ! __check_command_exists git; then + __apt_get_install_noinput git-core || return 1 + fi + + if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then + __apt_get_install_noinput ca-certificates + fi + __git_clone_and_checkout || return 1 __PACKAGES="" @@ -2955,6 +2963,10 @@ install_debian_git_deps() { __apt_get_install_noinput git || return 1 fi + if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then + __apt_get_install_noinput ca-certificates + fi + __git_clone_and_checkout || return 1 __PACKAGES="libzmq3 libzmq3-dev lsb-release python-apt python-backports.ssl-match-hostname python-crypto" @@ -2992,6 +3004,10 @@ install_debian_8_git_deps() { __apt_get_install_noinput git || return 1 fi + if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then + __apt_get_install_noinput ca-certificates + fi + __git_clone_and_checkout || return 1 __PACKAGES='libzmq3 libzmq3-dev lsb-release python-apt python-crypto python-jinja2 python-msgpack python-requests python-yaml python-zmq'