From f80fdfa32acacee024458844a27d0b9269a141c4 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 30 Apr 2014 15:32:20 -0700 Subject: [PATCH] privisoners/salt: proper bootstrap URL [GH-3583] --- CHANGELOG.md | 1 + plugins/provisioners/salt/bootstrap-salt.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc1620850..58aa466a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ BUG FIXES: - provisioners/salt: Always copy keys and configs on provision. [GH-3536] - provisioners/salt: Install args should always be present with bootstrap. - provisioners/salt: Overwrite keys properly on subsequent provisions [GH-3575] + - provisioners/salt: Bootstrap uses raw GitHub URL rather than subdomain. [GH-3583] - synced\_folders/nfs: Acquires a process-level lock so exports don't collide with Vagrant running in parallel. - synced\_folders/rsync: Add UserKnownHostsFile option to not complain. [GH-3511] diff --git a/plugins/provisioners/salt/bootstrap-salt.sh b/plugins/provisioners/salt/bootstrap-salt.sh index 253d9015b..9d8cd0d31 100755 --- a/plugins/provisioners/salt/bootstrap-salt.sh +++ b/plugins/provisioners/salt/bootstrap-salt.sh @@ -2,11 +2,11 @@ # We just download the bootstrap script by default and execute that. if [ -x /usr/bin/fetch ]; then - /usr/bin/fetch -o - http://bootstrap.saltstack.org | sh -s -- "$@" + /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" elif [ -x /usr/bin/curl ]; then - /usr/bin/curl -L http://bootstrap.saltstack.org | sh -s -- "$@" + /usr/bin/curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" else python \ - -c 'import urllib; print urllib.urlopen("http://bootstrap.saltstack.org").read()' \ + -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' \ | sh -s -- "$@" fi