add stable insecure one-line, minor reorganization

This commit is contained in:
Justin Findlay 2015-10-23 12:07:49 -06:00
parent ca3561d69c
commit a0994546f5

View file

@ -27,7 +27,7 @@ Bootstrap
--------- ---------
If you're looking for the *one-liner* to install salt, please scroll to the bottom and use the If you're looking for the *one-liner* to install salt, please scroll to the bottom and use the
instructions for `Installing via an Insecure One-Liner`_ instructions for `Installing via an Insecure One-Liner`_.
Examples Examples
@ -132,6 +132,10 @@ To install a specific branch from a git fork:
sudo sh install_salt.sh -g https://github.com/myuser/salt.git git mybranch sudo sh install_salt.sh -g https://github.com/myuser/salt.git git mybranch
Any of the example above which use two-lines can be made to run in a single-line
configuration with minor modifications, see `Installing via an Insecure One-Liner`_.
Installing via an Insecure One-Liner Installing via an Insecure One-Liner
------------------------------------ ------------------------------------
@ -145,15 +149,23 @@ The following examples illustrate how to install Salt via a one-liner.
Examples Examples
~~~~~~~~ ~~~~~~~~
Installing the latest develop branch of Salt: Installing the latest stable release of Salt (default):
.. code:: console .. code:: console
curl -L https://bootstrap.saltstack.com | sudo sh -s -- stable curl -L https://bootstrap.saltstack.com | sudo sh -s -- stable
Any of the example above which use two-lines can be made to run in a single-line or
configuration with minor modifications.
.. code:: console
curl -L https://bootstrap.saltstack.com | sudo sh -s
Installing the latest develop branch of Salt:
.. code:: console
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
Adding support for other operating systems Adding support for other operating systems