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

lavalamp · lavalamp · commit 25e712a6bcb9 · 2014-06-10T13:01:35.000-07:00
Switch from the deprecated bootstrap.saltstack.org to the .com redirect
diff --git a/cluster/templates/salt-master.sh b/cluster/templates/salt-master.sh
@@ -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
diff --git a/cluster/templates/salt-minion.sh b/cluster/templates/salt-minion.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd`
`47`	`47`	`# install. See https://github.com/saltstack/salt-bootstrap/issues/270`
`48`	`48`	`#`
`49`	`49`	`# -M installs the master`
`50`		`-curl -L http://bootstrap.saltstack.org \| sh -s -- -M -X`
	`50`	`+curl -L http://bootstrap.saltstack.com \| sh -s -- -M -X`
`51`	`51`
`52`	`52`	`echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ EOF`
`35`	`35`	`#`
`36`	`36`	`# We specify -X to avoid a race condition that can cause minion failure to`
`37`	`37`	`# install. See https://github.com/saltstack/salt-bootstrap/issues/270`
`38`		`-curl -L http://bootstrap.saltstack.org \| sh -s -- -X`
	`38`	`+curl -L http://bootstrap.saltstack.com \| sh -s -- -X`