Merge pull request #45 from whiteinge/update-bootstrap-url

Switch from the deprecated bootstrap.saltstack.org to the .com redirect
pull/6/head
Daniel Smith 2014-06-10 13:01:35 -07:00
commit 25e712a6bc
2 changed files with 2 additions and 2 deletions

View File

@ -47,6 +47,6 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
# install. See https://github.com/saltstack/salt-bootstrap/issues/270
#
# -M installs the master
curl -L http://bootstrap.saltstack.org | sh -s -- -M -X
curl -L http://bootstrap.saltstack.com | sh -s -- -M -X
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd

View File

@ -35,4 +35,4 @@ EOF
#
# We specify -X to avoid a race condition that can cause minion failure to
# install. See https://github.com/saltstack/salt-bootstrap/issues/270
curl -L http://bootstrap.saltstack.org | sh -s -- -X
curl -L http://bootstrap.saltstack.com | sh -s -- -X