saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Define _REPO_URL default at the top of the script

Browse source 
And update a comment to not include the $_REPO_URL variable
This commit is contained in:
rallytime 2017-04-14 09:53:43 -06:00
parent aed01b7df9
commit 2c2dcb0c10
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bootstrap-salt.sh
View file

@ -239,6 +239,7 @@ _CUSTOM_REPO_URL="null"
_CUSTOM_MASTER_CONFIG="null"
_CUSTOM_MINION_CONFIG="null"
_QUIET_GIT_INSTALLATION=$BS_FALSE
_REPO_URL="repo.saltstack.com"
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __usage
@ -558,8 +559,6 @@ if [ "$_CUSTOM_REPO_URL" != "null" ]; then
echowarn "Detected -R option. No other repositories will be configured when -R is used. Setting -r option to True."
_DISABLE_REPOS=$BS_TRUE
fi
else
_REPO_URL="repo.saltstack.com"
fi
# Check for any unparsed arguments. Should be an error.
@ -2936,7 +2935,7 @@ install_debian_8_deps() {
exit 1
fi
# Versions starting with 2015.5.6, 2015.8.1 and 2016.3.0 are hosted at $_REPO_URL
# Versions starting with 2015.5.6, 2015.8.1 and 2016.3.0 are hosted at repo.saltstack.com
if [ "$(echo "$STABLE_REV" | egrep '^(2015\.5|2015\.8|2016\.3|2016\.11|latest|archive\/201[5-6]\.)')" != "" ]; then
SALTSTACK_DEBIAN_URL="${HTTP_VAL}://${_REPO_URL}/apt/debian/${DISTRO_MAJOR_VERSION}/${__REPO_ARCH}/${STABLE_REV}"
echo "deb $SALTSTACK_DEBIAN_URL jessie main" > "/etc/apt/sources.list.d/saltstack.list"