valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak "quick install" instructions

Browse Source 
1. Use curl for both master and minion, for consistency
2. Clean up introductory lead text
3. Demonstrate -A option with minion
4. Remove some redundant text.
5. Make capitalisation consistent.
6. Use “set up a Salt Master/Minion” rather than “install the Salt
Master/Minion” for usability. (“The Salt Minion” sounds weird when you
will have many of them.)
7. Embolden 'Salt Minion' and 'Salt Master' for quick scanning.
This commit is contained in:
Steve Bennett 2014-02-24 22:29:56 +11:00
parent 0bd0dbe55b
commit 8e59bccfcc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/topics/installation/index.rst
View File

@ -11,21 +11,24 @@ Installation
Quick Install
-------------
Many popular distributions will be able to install the salt minion by executing
the bootstrap script:
On most distributions, you can set up a **Salt Minion** with the bootstrap script:
.. code-block:: bash
wget -O - http://bootstrap.saltstack.org | sudo sh
curl -L http://bootstrap.saltstack.org | sudo sh
Run the following script to install just the Salt Master:
or, to connect immediately to a running Salt Master:
.. code-block:: bash
curl -L http://bootstrap.saltstack.org | sudo sh -s -- -A saltmaster.example.com
To set up a **Salt Master**:
.. code-block:: bash
curl -L http://bootstrap.saltstack.org | sudo sh -s -- -M -N
The script should also make it simple to install a salt master, if desired.
Currently the install script has been tested to work on:
* Ubuntu 10.x/11.x/12.x