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

Merge pull request #1871 from pjcreath/develop

Browse source 
Add support for the -R flag on macOS.
This commit is contained in:
Gareth J. Greenaway 2022-12-07 09:02:09 -08:00 • committed by GitHub
commit 36fc77d9b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap-salt.sh
View file

@ -388,7 +388,7 @@ __usage() {
points to a repository that mirrors Salt packages located at
repo.saltproject.io. The option passed with -R replaces the
"repo.saltproject.io". If -R is passed, -r is also set. Currently only
works on CentOS/RHEL and Debian based distributions.
works on CentOS/RHEL and Debian based distributions and macOS.
-s Sleep time used when waiting for daemons to start, restart and when
checking for the services running. Default: ${__DEFAULT_SLEEP}
-S Also install salt-syndic
@ -8222,7 +8222,7 @@ __macosx_get_packagesite() {
fi
PKG="salt-${STABLE_REV}-${__PY_VERSION_REPO}-${DARWIN_ARCH}.pkg"
SALTPKGCONFURL="https://repo.saltproject.io/osx/${PKG}"
SALTPKGCONFURL="https://${_REPO_URL}/osx/${PKG}"
}
# Using a separate conf step to head for idempotent install...