mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-15 17:20:20 +00:00
Fixed help output and README
This commit is contained in:
parent
c2071bd443
commit
320b3b787e
2 changed files with 8 additions and 8 deletions
|
@ -264,8 +264,7 @@ Using ``wget`` to install your distribution's stable packages:
|
|||
|
||||
.. code:: console
|
||||
|
||||
wget -O bootstrap-salt.sh
|
||||
https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh
|
||||
wget -O bootstrap-salt.sh https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh
|
||||
sudo sh bootstrap-salt.sh
|
||||
|
||||
Installing a specific version from git using ``wget``:
|
||||
|
@ -359,8 +358,7 @@ Using ``PowerShell`` to install latest stable version:
|
|||
|
||||
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12'
|
||||
Invoke-WebRequest -Uri https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.ps1 -OutFile "$env:TEMP\bootstrap-salt.ps1"
|
||||
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
|
||||
& "$env:TEMP\bootstrap-salt.ps1"
|
||||
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser & "$env:TEMP\bootstrap-salt.ps1"
|
||||
|
||||
Display information about the install script parameters:
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#======================================================================================================================
|
||||
set -o nounset # Treat unset variables as an error
|
||||
|
||||
__ScriptVersion="2024.11.21"
|
||||
__ScriptVersion="2024.11.22"
|
||||
__ScriptName="bootstrap-salt.sh"
|
||||
|
||||
__ScriptFullName="$0"
|
||||
|
@ -314,6 +314,9 @@ __usage() {
|
|||
|
||||
Usage : ${__ScriptName} [options] <install-type> [install-type-args]
|
||||
|
||||
|
||||
Usage : bootstrap-salt.sh [options] <install-type> [install-type-args]
|
||||
|
||||
Installation types:
|
||||
- stable Install latest stable release. This is the default
|
||||
install type
|
||||
|
@ -351,7 +354,6 @@ __usage() {
|
|||
- ${__ScriptName} onedir_rc
|
||||
- ${__ScriptName} onedir_rc 3008
|
||||
|
||||
|
||||
Options:
|
||||
-a Pip install all Python pkg dependencies for Salt. Requires -V to install
|
||||
all pip pkgs into the virtualenv.
|
||||
|
@ -373,7 +375,7 @@ __usage() {
|
|||
-f Force shallow cloning for git installations.
|
||||
This may result in an "n/a" in the version number.
|
||||
-F Allow copied files to overwrite existing (config, init.d, etc)
|
||||
-g Salt Git repository URL. Default: ${_SALTSTACK_REPO_URL}
|
||||
-g Salt Git repository URL. Default: https://github.com/saltstack/salt.git
|
||||
-h Display this message
|
||||
-H Use the specified HTTP proxy for all download URLs (including https://).
|
||||
For example: http://myproxy.example.com:3128
|
||||
|
@ -419,7 +421,7 @@ __usage() {
|
|||
"packages.broadcom.com". If -R is passed, -r is also set. Currently only
|
||||
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}
|
||||
checking for the services running. Default: 3
|
||||
-S Also install salt-syndic
|
||||
-r Disable all repository configuration performed by this script. This
|
||||
option assumes all necessary repository configuration is already present
|
||||
|
|
Loading…
Add table
Reference in a new issue